From 0a5365bd2a324ce3485f58e39365354ff39bfb7e Mon Sep 17 00:00:00 2001 From: Tushar Patil Date: Tue, 30 Aug 2011 17:57:05 -0700 Subject: Fix for LP Bug #782364 --- nova/network/linux_net.py | 8 ++++---- 1 file 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)): -- cgit