commit e67530f84618db4fd5ff1bd1e6af97c41c68c5aa
author Jenkins <jenkins@review.openstack.org> Wed Oct 14 18:32:51 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Oct 14 18:32:51 2015 +0000
tree e9fa481109bfbf458368237f958260a7b55d1117
parent 6f991a852390f345ccd57643923b89af87bd52cf
parent 1d662e86bbafebbdef01307b20a7f8a21d1f8e03

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

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 667aa1e..ebb7570 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -811,11 +811,11 @@
         local ADD_OVS_PORT=""
 
         if [[ $af == "inet" ]]; then
-            IP_BRD=$(ip -f $af a s dev $from_intf | grep $HOST_IP | awk '{ print $2, $3, $4; exit }')
+            IP_BRD=$(ip -f $af a s dev $from_intf | grep inet | awk '{ print $2, $3, $4; exit }')
         fi
 
         if [[ $af == "inet6" ]]; then
-            IP_BRD=$(ip -f $af a s dev $from_intf | grep $HOST_IPV6 | awk '{ print $2, $3, $4; exit }')
+            IP_BRD=$(ip -f $af a s dev $from_intf | grep inet6 | awk '{ print $2, $3, $4; exit }')
         fi
 
         if [ "$DEFAULT_ROUTE_GW" != "" ]; then