Add SETUP conf var

[snf-network] / clear-proxy-ndp

diff --git a/clear-proxy-ndp b/clear-proxy-ndp
index 0ad38e4..393bc0c 100755 (executable)
--- a/clear-proxy-ndp
+++ b/clear-proxy-ndp
@@ -2,30 +2,33 @@
 
 MAC2EUI64=/usr/bin/mac2eui64
 
-
-
-host=$(hostname)
-domain=$(hostname -d)
-
-
-if [ "$GANETI_INSTANCE_PRIMARY" != "$host.$domain" ]; then
-  exit 0
-fi
-
 source /etc/default/snf-network
 
 source $CONF
+source $STATE_DIR/infra
 
-NETWORK=$GANETI_INSTANCE_NIC0_NETWORK
-MODE=$GANETI_INSTANCE_NIC0_MODE
-LINK=$GANETI_INSTANCE_NIC0_LINK
-MAC=$GANETI_INSTANCE_NIC0_MAC
-
-source $SHAREDDIR/networks/$NETWORK
+host=$(hostname)
+domain=$(hostname -d)
 
-if [ "$MODE" == "routed" ] ; then
-    EUI64=$($MAC2EUI64 $MAC $SUBNET6 2>/dev/null)
 
-    ip -6 neigh del proxy $EUI64 dev $GATEWAY6 >/dev/null 2>&1
+if [ "$GANETI_INSTANCE_PRIMARY" = "$host.$domain" ]; then
+
+  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  
+
+  for tag in $TAGS; do
+    case tag in
+    ip-less-routed)
+      EUI64=$($MAC2EUI64 $MAC $SUBNET6 2>/dev/null)
+      ip -6 neigh del proxy $EUI64 dev $PUBLIC_VLAN >/dev/null 2>&1
+    ;;
+    esac
+  done
 fi
 
+echo done