# diff -u /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py.orig 2013-06-06 17:20:03.928751907 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py 2013-06-08 00:25:35.919838475 +0900
@@ -291,11 +293,11 @@
def _set_device_plugin_tag(self, network_id, device_name, namespace=None):
plugin_tag = self._get_flavor_by_network_id(network_id)
-device = ip_lib.IPDevice(device_name, self.conf.root_helper, namespace)
+device = ip_lib.IPDevice(device_name, self.root_helper, namespace)
device.link.set_alias(plugin_tag)
def _get_device_plugin_tag(self, device_name, namespace=None):
-device = ip_lib.IPDevice(device_name, self.conf.root_helper, namespace)
+device = ip_lib.IPDevice(device_name, self.root_helper, namespace)
return device.link.alias
def get_device_name(self, port):
# diff -u /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py.orig 2013-06-07 23:57:42.259839168 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py 2013-06-07 23:58:13.121839155 +0900
@@ -324,7 +324,7 @@
pm = external_process.ProcessManager(
self.conf,
network.id,
-self.conf.root_helper,
+self.root_helper,
self._ns_name(network))
pm.enable(callback)
@@ -332,7 +332,7 @@
pm = external_process.ProcessManager(
self.conf,
network.id,
-self.conf.root_helper,
+self.root_helper,
self._ns_name(network))
pm.disable()
# diff -u /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py.orig 2013-06-07 23:59:25.365839124 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py 2013-06-07 23:59:36.360839119 +0900
@@ -649,12 +649,12 @@
'via', route['nexthop']]
#TODO(nati) move this code to iplib
if self.conf.use_namespaces:
-ip_wrapper = ip_lib.IPWrapper(self.conf.root_helper,
+ip_wrapper = ip_lib.IPWrapper(self.root_helper,
namespace=ri.ns_name())
ip_wrapper.netns.execute(cmd, check_exit_code=False)
else:
utils.execute(cmd, check_exit_code=False,
- root_helper=self.conf.root_helper)
+ root_helper=self.root_helper)
def routes_updated(self, ri):
new_routes = ri.router['routes']
是否可以解决您的问题?
好像是网络有问题,改一下下面三个文件(有可能是两个,有一个好像已经是好的。)# diff -u /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py.orig 2013-06-06 17:20:03.928751907 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/linux/interface.py 2013-06-08 00:25:35.919838475 +0900
@@ -291,11 +293,11 @@
def _set_device_plugin_tag(self, network_id, device_name, namespace=None):
plugin_tag = self._get_flavor_by_network_id(network_id)
-device = ip_lib.IPDevice(device_name, self.conf.root_helper, namespace)
+device = ip_lib.IPDevice(device_name, self.root_helper, namespace)
device.link.set_alias(plugin_tag)
def _get_device_plugin_tag(self, device_name, namespace=None):
-device = ip_lib.IPDevice(device_name, self.conf.root_helper, namespace)
+device = ip_lib.IPDevice(device_name, self.root_helper, namespace)
return device.link.alias
def get_device_name(self, port):
# diff -u /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py.orig 2013-06-07 23:57:42.259839168 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/dhcp_agent.py 2013-06-07 23:58:13.121839155 +0900
@@ -324,7 +324,7 @@
pm = external_process.ProcessManager(
self.conf,
network.id,
-self.conf.root_helper,
+self.root_helper,
self._ns_name(network))
pm.enable(callback)
@@ -332,7 +332,7 @@
pm = external_process.ProcessManager(
self.conf,
network.id,
-self.conf.root_helper,
+self.root_helper,
self._ns_name(network))
pm.disable()
# diff -u /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py{.orig,}
--- /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py.orig 2013-06-07 23:59:25.365839124 +0900
+++ /usr/lib/python2.6/site-packages/quantum/agent/l3_agent.py 2013-06-07 23:59:36.360839119 +0900
@@ -649,12 +649,12 @@
'via', route['nexthop']]
#TODO(nati) move this code to iplib
if self.conf.use_namespaces:
-ip_wrapper = ip_lib.IPWrapper(self.conf.root_helper,
+ip_wrapper = ip_lib.IPWrapper(self.root_helper,
namespace=ri.ns_name())
ip_wrapper.netns.execute(cmd, check_exit_code=False)
else:
utils.execute(cmd, check_exit_code=False,
- root_helper=self.conf.root_helper)
+ root_helper=self.root_helper)
def routes_updated(self, ri):
new_routes = ri.router['routes']
欢迎分享,转载请注明来源:内存溢出
评论列表(0条)