summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTushar Patil <tushar.vitthal.patil@gmail.com>2011-08-30 17:57:05 -0700
committerTushar Patil <tushar.vitthal.patil@gmail.com>2011-08-30 17:57:05 -0700
commit0a5365bd2a324ce3485f58e39365354ff39bfb7e (patch)
tree672d0fad3bc9b04a910dcc8abda7a50e1e657a87
parent048c7fe5b0f38a675a8540228add59e24737e674 (diff)
downloadnova-0a5365bd2a324ce3485f58e39365354ff39bfb7e.tar.gz
nova-0a5365bd2a324ce3485f58e39365354ff39bfb7e.tar.xz
nova-0a5365bd2a324ce3485f58e39365354ff39bfb7e.zip
Fix for LP Bug #782364
-rw-r--r--nova/network/linux_net.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 73fafdfbb..aa4bd1ea7 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -481,6 +481,10 @@ def initialize_gateway_device(dev, network_ref):
check_exit_code=False)
if err and err != 'RTNETLINK answers: File exists\n':
raise exception.Error('Failed to add ip: %s' % err)
+ if FLAGS.send_arp_for_ha:
+ _execute('sudo', 'arping', '-U', network_ref['gateway'],
+ '-A', '-I', dev,
+ '-c', 1, check_exit_code=False)
if(FLAGS.use_ipv6):
_execute('ip', '-f', 'inet6', 'addr',
'change', network_ref['cidr_v6'],
@@ -859,10 +863,6 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
if gateway:
_execute('route', 'add', 'default', 'gw', gateway,
run_as_root=True)
- if FLAGS.send_arp_for_ha:
- _execute('sudo', 'arping', '-U', gateway,
- '-A', '-I', bridge,
- '-c', 1, check_exit_code=False)
if (err and err != "device %s is already a member of a bridge;"
"can't enslave it to bridge %s.\n" % (interface, bridge)):