commit | 585501a250cd4ee8210c81176ce89b0430b97753 | [log] [tgz] |
---|---|---|
author | Jenkins <jenkins@review.openstack.org> | Tue Nov 17 06:12:40 2015 +0000 |
committer | Gerrit Code Review <review@openstack.org> | Tue Nov 17 06:12:40 2015 +0000 |
tree | 605738619feed2450e37e9f4c6036fa84137865b | |
parent | 8f07ef84dbb9f695bbedee87d26e7525d3a01182 [diff] | |
parent | 9af81997b543f7634c180b73a036c59456118b50 [diff] |
Merge "Only take the first global, non temporary ipv6 address"
diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 6852471..7b6f1c6 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy
@@ -806,7 +806,7 @@ 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