commit bf5f5880b34fe31eb9e3b32701bd927e9778e50b
author Jenkins <jenkins@review.openstack.org> Wed Nov 18 00:10:07 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 18 00:10:07 2015 +0000
tree 23052a99a43e6913b6f60f0c673578127d86739f
parent 585501a250cd4ee8210c81176ce89b0430b97753
parent 790266f0d2b752627a8ac641c8f1c9ba1e8e85e8

Merge "Delete $IPV6_PUBLIC_NETWORK_GATEWAY IP during cleanup"

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 7b6f1c6..c7d45e6 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -834,6 +834,10 @@
         _move_neutron_addresses_route "$OVS_PHYSICAL_BRIDGE" "$PUBLIC_INTERFACE" False "inet"
 
         if [[ $(ip -f inet6 a s dev "$OVS_PHYSICAL_BRIDGE" | grep -c 'global') != 0 ]]; then
+            # ip(8) wants the prefix length when deleting
+            local v6_gateway
+            v6_gateway=$(ip -6 a s dev $OVS_PHYSICAL_BRIDGE | grep $IPV6_PUBLIC_NETWORK_GATEWAY | awk '{ print $2 }')
+            sudo ip -6 addr del $v6_gateway dev $OVS_PHYSICAL_BRIDGE
             _move_neutron_addresses_route "$OVS_PHYSICAL_BRIDGE" "$PUBLIC_INTERFACE" False "inet6"
         fi