Merge "Only take the first global, non temporary ipv6 address"

This commit is contained in:
Jenkins 2015-11-17 06:12:40 +00:00 committed by Gerrit Code Review
commit 585501a250
1 changed files with 1 additions and 1 deletions

View File

@ -806,7 +806,7 @@ function _move_neutron_addresses_route {
fi
if [[ $af == "inet6" ]]; then
IP_BRD=$(ip -f $af a s dev $from_intf | grep inet6 | awk '{ print $2, $3, $4; exit }')
IP_BRD=$(ip -f $af a s dev $from_intf | grep 'scope global' | sed '/temporary/d' | awk '{ print $2, $3, $4; exit }')
fi
if [ "$DEFAULT_ROUTE_GW" != "" ]; then