Browse code

Merge "HOST_IP should not be used in moving address to route"

Jenkins authored on 2015/10/15 03:32:51
Showing 1 changed files
... ...
@@ -811,11 +811,11 @@ function _move_neutron_addresses_route {
811 811
         local ADD_OVS_PORT=""
812 812
 
813 813
         if [[ $af == "inet" ]]; then
814
-            IP_BRD=$(ip -f $af a s dev $from_intf | grep $HOST_IP | awk '{ print $2, $3, $4; exit }')
814
+            IP_BRD=$(ip -f $af a s dev $from_intf | grep inet | awk '{ print $2, $3, $4; exit }')
815 815
         fi
816 816
 
817 817
         if [[ $af == "inet6" ]]; then
818
-            IP_BRD=$(ip -f $af a s dev $from_intf | grep $HOST_IPV6 | awk '{ print $2, $3, $4; exit }')
818
+            IP_BRD=$(ip -f $af a s dev $from_intf | grep inet6 | awk '{ print $2, $3, $4; exit }')
819 819
         fi
820 820
 
821 821
         if [ "$DEFAULT_ROUTE_GW" != "" ]; then