openstack/nova
Code Issues Proposed changes

Merge "Use new ip addr del syntax"

Browse Source
This commit is contained in:
Jenkins 2011-10-13 04:39:08 +00:00 committed by Gerrit Code Review
commit 7d34fb7505
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/linux_net.py
View File

@ -403,7 +403,7 @@ def init_host():
def bind_floating_ip(floating_ip, check_exit_code=True):
"""Bind ip to public interface."""
_execute('ip', 'addr', 'add', floating_ip,
_execute('ip', 'addr', 'add', str(floating_ip) + '/32',
'dev', FLAGS.public_interface,
run_as_root=True, check_exit_code=check_exit_code)
if FLAGS.send_arp_for_ha:
@ -414,7 +414,7 @@ def bind_floating_ip(floating_ip, check_exit_code=True):
def unbind_floating_ip(floating_ip):
"""Unbind a public ip from public interface."""
_execute('ip', 'addr', 'del', floating_ip,
_execute('ip', 'addr', 'del', str(floating_ip) + '/32',
'dev', FLAGS.public_interface, run_as_root=True)