Browse code

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

Jenkins authored on 2016/01/07 02:32:48
Showing 1 changed files
... ...
@@ -800,7 +800,9 @@ function _move_neutron_addresses_route {
800 800
 
801 801
         local IP_ADD=""
802 802
         local IP_DEL=""
803
-        local DEFAULT_ROUTE_GW=$(ip r | awk "/default.+$from_intf/ { print \$3; exit }")
803
+        local IP_UP=""
804
+        local DEFAULT_ROUTE_GW
805
+        DEFAULT_ROUTE_GW=$(ip r | awk "/default.+$from_intf/ { print \$3; exit }")
804 806
         local ADD_OVS_PORT=""
805 807
 
806 808
         if [[ $af == "inet" ]]; then
... ...
@@ -822,9 +824,10 @@ function _move_neutron_addresses_route {
822 822
         if [[ "$IP_BRD" != "" ]]; then
823 823
             IP_DEL="sudo ip addr del $IP_BRD dev $from_intf"
824 824
             IP_ADD="sudo ip addr add $IP_BRD dev $to_intf"
825
+            IP_UP="sudo ip link set $to_intf up"
825 826
         fi
826 827
 
827
-        $IP_DEL; $IP_ADD; $ADD_OVS_PORT; $ADD_DEFAULT_ROUTE
828
+        $IP_DEL; $IP_ADD; $IP_UP; $ADD_OVS_PORT; $ADD_DEFAULT_ROUTE
828 829
     fi
829 830
 }
830 831