Merge branch 'develop' into debian-develop

[snf-network] / clear-proxy-ndp

diff --git a/clear-proxy-ndp b/clear-proxy-ndp
index 75ab779..c790b24 100755 (executable)
--- a/clear-proxy-ndp
+++ b/clear-proxy-ndp
@@ -2,33 +2,33 @@
 
 MAC2EUI64=/usr/bin/mac2eui64
 
-
+source /etc/default/snf-network
 
 host=$(hostname)
 domain=$(hostname -d)
 
-echo `date` > /home/dimara/asdfadsf
-
-if [ "$GANETI_INSTANCE_PRIMARY" == "$host.$domain" ]; then
-
-  source /etc/default/snf-network
 
-  source $CONF
+if [ "$GANETI_INSTANCE_PRIMARY" = "$host.$domain" ]; then
 
-  NETWORK=$GANETI_INSTANCE_NIC0_NETWORK
-  MODE=$GANETI_INSTANCE_NIC0_MODE
-  LINK=$GANETI_INSTANCE_NIC0_LINK
-  MAC=$GANETI_INSTANCE_NIC0_MAC
-  SUBNET6=$INSTANCE_NIC0_NETWORK_SUBNET6
-  
-  source $SHAREDDIR/infra/$host
+  NETWORK="$GANETI_INSTANCE_NIC0_NETWORK"
+  NETWORK_TYPE="$GANETI_INSTANCE_NIC0_NETWORK_TYPE"
+  MODE="$GANETI_INSTANCE_NIC0_MODE"
+  LINK="$GANETI_INSTANCE_NIC0_LINK"
+  MAC="$GANETI_INSTANCE_NIC0_MAC"
+  SUBNET6="$GANETI_INSTANCE_NIC0_NETWORK_SUBNET6"
+  TAGS="$GANETI_INSTANCE_NIC0_NETWORK_TAGS"
 
-  if [ "$MODE" == "routed" ] ; then
+  for tag in $TAGS; do
+    case $tag in
+    $IP_LESS_ROUTED_TAG)
       EUI64=$($MAC2EUI64 $MAC $SUBNET6 2>/dev/null)
-      echo $EUI64 >> /home/dimara/asdfadsf
+      uplink=$(ip -6 route list table $LINK | grep "default via" | awk '{print $5}')
 
-      ip -6 neigh del proxy $EUI64 dev $PUBLIC_VLAN >/dev/null 2>&1
-  fi
-
-  echo $GANETI_INSTANCE_PRIMARY >> /home/dimara/asdfadsf
+      hooks-log clear-proxy-ndp "ip -6 neigh del proxy $EUI64 dev $uplink"
+      ip -6 neigh del proxy $EUI64 dev $uplink >/dev/null 2>&1
+    ;;
+    esac
+  done
 fi
+
+exit 0