diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-18 18:30:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-18 18:30:23 +0000 |
| commit | a76f08b971e58f1f58280374600ca2c62f674e4d (patch) | |
| tree | f1580d53c8f8315e770ebe8e3fac0ddd89688144 | |
| parent | dae5b2c6f745a0403713fd426a17dd3e7f517b5b (diff) | |
| parent | 7e845f4af6f89253d9c47645875aa67ef24ebee3 (diff) | |
| download | nova-a76f08b971e58f1f58280374600ca2c62f674e4d.tar.gz nova-a76f08b971e58f1f58280374600ca2c62f674e4d.tar.xz nova-a76f08b971e58f1f58280374600ca2c62f674e4d.zip | |
Merge "Fix for Quantum LinuxBridge Intf driver plug call"
| -rwxr-xr-x | nova/network/linux_net.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 92f0afb4c..b2b68b5b7 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -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 |