Modify scripts to include network tags

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

diff --git a/clear-proxy-ndp b/clear-proxy-ndp
index 1c09b99..393bc0c 100755 (executable)
--- a/clear-proxy-ndp
+++ b/clear-proxy-ndp
@@ -19,11 +19,16 @@ if [ "$GANETI_INSTANCE_PRIMARY" = "$host.$domain" ]; then
   LINK=$GANETI_INSTANCE_NIC0_LINK
   MAC=$GANETI_INSTANCE_NIC0_MAC
   SUBNET6=$GANETI_INSTANCE_NIC0_NETWORK_SUBNET6
-  
-  if [ "$MODE" = "routed" -a "$NETWORK_TYPE" = "public" ] ; then
+  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
-  fi
+    ;;
+    esac
+  done
 fi
 
 echo done

diff --git a/hooks/network-connect-post.d/snf-network b/hooks/network-connect-post.d/snf-network
index 2398bd3..03f1cf5 100755 (executable)
--- a/hooks/network-connect-post.d/snf-network
+++ b/hooks/network-connect-post.d/snf-network
@@ -15,19 +15,15 @@ if $ENABLE_AUTO_CONF_HOOKS; then
   . snf-network-get-network-env
 
 
-  if [ "$MODE" = "routed" -a "$TYPE" = "public-routed" ]; then
-
-    snf-network-ipless-routing-on "$LINK" "$SUBNET" "$GATEWAY" "$SUBNET6" "$GATEWAY6"
-
-  fi
-
-
-  if [ -a $ENABLE_MASQ \
-       -a -n "$GATEWAY" -a "$MODE" = "bridged" \
-       -a "$TYPE" = "masq" -a "$LINK" = "$MASQ_BRIDGE" ]; then
-
-    snf-network-masq-on "$LINK" "$SUBNET" "$GATEWAY"
-
-  fi
-
+  for tag in $NETWORK_TAGS; do
+    case $tag in
+    ip-less-routed)
+      snf-network-ipless-routing-on "$LINK" "$SUBNET" "$GATEWAY" "$SUBNET6" "$GATEWAY6"
+    ;;
+    masq)
+      snf-network-masq-on "$LINK" "$SUBNET" "$GATEWAY"
+    ;;
+    esac
+  done
+   
 fi

diff --git a/hooks/network-disconnect-post.d/snf-network b/hooks/network-disconnect-post.d/snf-network
index 4999aae..6f87d7a 100755 (executable)
--- a/hooks/network-disconnect-post.d/snf-network
+++ b/hooks/network-disconnect-post.d/snf-network
@@ -4,9 +4,8 @@ source /etc/default/snf-network
 
 source $CONF
 
-
 if $ENABLE_AUTO_CONF_HOOKS; then
-
+  
   source $STATE_DIR/infra
 
   NETWORK=$GANETI_GROUP_NETWORK_NAME
@@ -16,19 +15,15 @@ if $ENABLE_AUTO_CONF_HOOKS; then
   . snf-network-get-network-env
 
 
-  if [ "$MODE" = "routed" -a "$TYPE" = "public-routed" ]; then
-
-    snf-network-ipless-routing-off "$LINK" "$SUBNET" "$GATEWAY" "$SUBNET6" "$GATEWAY6"
-
-  fi
-
-
-  if [ -a $ENABLE_MASQ \
-       -a -n "$GATEWAY" -a "$MODE" = "bridged" \
-       -a "$TYPE" = "masq" -a "$LINK" = "$MASQ_BRIDGE" ]; then
-
-    snf-network-masq-off "$LINK" "$SUBNET" "$GATEWAY"
-
-  fi
-
+  for tag in $NETWORK_TAGS; do
+    case $tag in
+    ip-less-routed)
+      snf-network-ipless-routing-off "$LINK" "$SUBNET" "$GATEWAY" "$SUBNET6" "$GATEWAY6"
+    ;;
+    masq)
+      snf-network-masq-off "$LINK" "$SUBNET" "$GATEWAY"
+    ;;
+    esac
+  done
+   
 fi

diff --git a/hooks/node-add-post.d/snf-network b/hooks/node-add-post.d/snf-network
index 1493a63..c9e9c20 100755 (executable)
--- a/hooks/node-add-post.d/snf-network
+++ b/hooks/node-add-post.d/snf-network
@@ -8,7 +8,7 @@ if $ENABLE_AUTO_CONF_HOOKS; then
 
   NODE=$GANETI_NODE_NAME
 
-  HOSTNAME=$(hostname)
+  HOSTNAME=$(hostname).$(hostname -d)
 
   if [ "$HOSTNAME" = "$NODE" ]; then
     snf-network-build-node-infra

diff --git a/snf-network-get-network-env b/snf-network-get-network-env
index a99fe8c..b536405 100755 (executable)
--- a/snf-network-get-network-env
+++ b/snf-network-get-network-env
@@ -11,3 +11,5 @@ export GATEWAY6=$GANETI_NETWORK_GATEWAY6
 export MAC_PREFIX=$GANETI_NETWORK_MAC_PREFIX
 
 export TYPE=$GANETI_NETWORK_TYPE
+
+export TAGS="$GANETI_NETWORK_TAGS"