Browse code

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

Jenkins authored on 2015/11/17 15:12:40
Showing 1 changed files
... ...
@@ -806,7 +806,7 @@ function _move_neutron_addresses_route {
806 806
         fi
807 807
 
808 808
         if [[ $af == "inet6" ]]; then
809
-            IP_BRD=$(ip -f $af a s dev $from_intf | grep inet6 | awk '{ print $2, $3, $4; exit }')
809
+            IP_BRD=$(ip -f $af a s dev $from_intf | grep 'scope global' | sed '/temporary/d' | awk '{ print $2, $3, $4; exit }')
810 810
         fi
811 811
 
812 812
         if [ "$DEFAULT_ROUTE_GW" != "" ]; then