Merge "Fix for Quantum LinuxBridge Intf driver plug call"

2012-05-18 18:30:23 +00:00
parent dae5b2c6f7 7e845f4af6
commit a76f08b971
1 changed files with 4 additions and 4 deletions
@@ -1154,10 +1154,10 @@ class QuantumLinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
            utils.execute('ip', 'link', 'set', bridge, 'up', run_as_root=True)
            LOG.debug(_("Done starting bridge %s"), bridge)

-        full_ip = '%s/%s' % (network['dhcp_server'],
-                             network['cidr'].rpartition('/')[2])
-        utils.execute('ip', 'address', 'add', full_ip, 'dev', bridge,
-                      run_as_root=True)
+            full_ip = '%s/%s' % (network['dhcp_server'],
+                                 network['cidr'].rpartition('/')[2])
+            utils.execute('ip', 'address', 'add', full_ip, 'dev', bridge,
+                          run_as_root=True)

        return dev