Merge "Make ARP_CMD local"

This commit is contained in:
Jenkins 2016-05-18 22:12:25 +00:00 committed by Gerrit Code Review
commit 84f83bf5ea

View File

@ -621,14 +621,13 @@ function _move_neutron_addresses_route {
DEFAULT_ROUTE_GW=$(ip -f $af r | awk "/default.+$from_intf/ { print \$3; exit }")
local ADD_OVS_PORT=""
local DEL_OVS_PORT=""
local ARP_CMD=""
IP_BRD=$(ip -f $af a s dev $from_intf scope global primary | grep inet | awk '{ print $2, $3, $4; exit }')
if [[ "$af" == "inet" ]]; then
IP=$(echo $IP_BRD | awk '{ print $1; exit }' | grep -o -E '(.*)/' | cut -d "/" -f1)
ARP_CMD="arping -A -c 3 -w 4.5 -I $to_intf $IP "
else
ARP_CMD=""
fi
if [ "$DEFAULT_ROUTE_GW" != "" ]; then