diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-09 15:27:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-09 15:27:05 +0000 |
| commit | 5970a553e79aa3fae71d85b35ed8a14fd51df296 (patch) | |
| tree | 9309e9446c39634e86150d4c9ce04de3463dd112 | |
| parent | 5a6defd6ec312c4447c5e854b2103be8169255ac (diff) | |
| parent | f5a45dde519c521921240dfda835a805f1eb05b3 (diff) | |
| download | nova-5970a553e79aa3fae71d85b35ed8a14fd51df296.tar.gz nova-5970a553e79aa3fae71d85b35ed8a14fd51df296.tar.xz nova-5970a553e79aa3fae71d85b35ed8a14fd51df296.zip | |
Merge "Nova network needs to take care of existing alias"
| -rw-r--r-- | nova/network/linux_net.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index cb23e77b6..e2fa963c6 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -1465,7 +1465,10 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver): for line in out.split('\n'): fields = line.split() if fields and fields[0] == 'inet': - params = fields[1:-1] + if fields[-2] == 'secondary': + params = fields[1:-2] + else: + params = fields[1:-1] _execute(*_ip_bridge_cmd('del', params, fields[-1]), run_as_root=True, check_exit_code=[0, 2, 254]) _execute(*_ip_bridge_cmd('add', params, bridge), |