Merge "Ensure link is set to up, when moving IP addresses across interfaces."

This commit is contained in:
Jenkins 2015-12-18 03:21:18 +00:00 committed by Gerrit Code Review
commit 3b7e6ab77c

View File

@ -802,6 +802,7 @@ function _move_neutron_addresses_route {
local IP_ADD=""
local IP_DEL=""
local IP_UP=""
local DEFAULT_ROUTE_GW
DEFAULT_ROUTE_GW=$(ip -f $af r | awk "/default.+$from_intf/ { print \$3; exit }")
local ADD_OVS_PORT=""
@ -819,9 +820,10 @@ function _move_neutron_addresses_route {
if [[ "$IP_BRD" != "" ]]; then
IP_DEL="sudo ip addr del $IP_BRD dev $from_intf"
IP_ADD="sudo ip addr add $IP_BRD dev $to_intf"
IP_UP="sudo ip link set $to_intf up"
fi
$IP_DEL; $IP_ADD; $ADD_OVS_PORT; $ADD_DEFAULT_ROUTE
$IP_DEL; $IP_ADD; $IP_UP; $ADD_OVS_PORT; $ADD_DEFAULT_ROUTE
fi
}