Browse code

Merge "Delete $IPV6_PUBLIC_NETWORK_GATEWAY IP during cleanup"

Jenkins authored on 2015/11/18 09:10:07
Showing 1 changed files
... ...
@@ -834,6 +834,10 @@ function cleanup_neutron {
834 834
         _move_neutron_addresses_route "$OVS_PHYSICAL_BRIDGE" "$PUBLIC_INTERFACE" False "inet"
835 835
 
836 836
         if [[ $(ip -f inet6 a s dev "$OVS_PHYSICAL_BRIDGE" | grep -c 'global') != 0 ]]; then
837
+            # ip(8) wants the prefix length when deleting
838
+            local v6_gateway
839
+            v6_gateway=$(ip -6 a s dev $OVS_PHYSICAL_BRIDGE | grep $IPV6_PUBLIC_NETWORK_GATEWAY | awk '{ print $2 }')
840
+            sudo ip -6 addr del $v6_gateway dev $OVS_PHYSICAL_BRIDGE
837 841
             _move_neutron_addresses_route "$OVS_PHYSICAL_BRIDGE" "$PUBLIC_INTERFACE" False "inet6"
838 842
         fi
839 843