[ create a new paste ] login | about

Link: http://codepad.org/XZlvUoBt    [ raw code | fork ]

C, pasted on Apr 7:
index 8c32947..0a603e3 100644
--- a/novadocker/virt/docker/driver.py
+++ b/novadocker/virt/docker/driver.py
@@ -127,9 +127,9 @@ class DockerDriver(driver.ComputeDriver):
         # can return an exit code of 1 in the cases where eth0 has
         # already been removed which occurs when nova-compute is restarted
         # and nova wants to replug all the vifs.
-        utils.execute('ip', 'netns', 'exec', container_id, 'ip',
-                      'link', 'delete', 'eth0', run_as_root=True,
-                       check_exit_code=[0, 1])
+        #utils.execute('ip', 'netns', 'exec', container_id, 'ip',
+        #              'link', 'delete', 'eth0', run_as_root=True,
+        #               check_exit_code=[0, 1])
         for vif in network_info:
             self.vif_driver.plug(instance, vif, container_id)
 
@@ -191,6 +191,7 @@ class DockerDriver(driver.ComputeDriver):
             'hypervisor_type': 'docker',
             'hypervisor_version': utils.convert_version_to_int('1.0'),
             'hypervisor_hostname': self._nodename,
+            'NetworkDisabled': True,
             'cpu_info': '?',
             'supported_instances': jsonutils.dumps([
                     ('i686', 'docker', 'lxc'),


Create a new paste based on this one


Comments: