openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2016-01-06 17:32:48 +00:00
committed by Gerrit Code Review
parent 46a272b31a 0387d1f951
commit 042e687b64
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/neutron-legacy
View File

@@ -800,7 +800,9 @@ function _move_neutron_addresses_route {
local IP_ADD=""
local IP_DEL=""
local DEFAULT_ROUTE_GW=$(ip r | awk "/default.+$from_intf/ { print \$3; exit }")
local IP_UP=""
local DEFAULT_ROUTE_GW
DEFAULT_ROUTE_GW=$(ip r | awk "/default.+$from_intf/ { print \$3; exit }")
local ADD_OVS_PORT=""
if [[ $af == "inet" ]]; then
@@ -822,9 +824,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
}