Distinguish between GRNET and generic setup

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

diff --git a/conf/snf-network.conf b/conf/snf-network.conf
index d29609e..515f6b7 100644 (file)
--- a/conf/snf-network.conf
+++ b/conf/snf-network.conf
@@ -1,7 +1,10 @@
 STATE_DIR=/var/lib/snf-network
 
-ENABLE_MASQ=false
+ENABLE_AUTO_CONF_HOOKS=false
 
-ENABLE_EBTABLES=false
+# public network with ip-less routing and physical VLANs
+# private networks bridged on physical VLANs
+GRNET_SETUP=true
 
-ENABLE_AUTO_CONF_HOOKS=false
+# one bridge for all (public, private - ebtables, masq)
+GENERIC_SETUP=false

diff --git a/snf-network-build-node-infra b/snf-network-build-node-infra
index 6eda85e..7cd16cd 100755 (executable)
--- a/snf-network-build-node-infra
+++ b/snf-network-build-node-infra
@@ -25,21 +25,30 @@ echo
 echo "# node's public interface MAC" 
 echo PUBLIC_MAC=$PUBLIC_MAC
 
-if [ -n "$PUBLIC_VLAN_ID" ]; then
-  echo 
-  echo PUBLIC_VLAN=$PUBLIC_IFACE.$PUBLIC_VLAN_ID
-fi
+if $GENERIC_SETUP; then
 
-if [ -n "$PRIVATE_VLAN_ID" ]; then
-  echo 
-  echo PRIVATE_VLAN=$PUBLIC_IFACE.$PRIVATE_VLAN_ID
-  echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID
-fi
+  echo MASQ_BRIDGE=$PUBLIC_BRIDGE
+
+elif $GRNET_SETUP; then
+
+  if [ -n "$PUBLIC_VLAN_ID" ]; then
+    echo 
+    echo PUBLIC_VLAN=$PUBLIC_IFACE.$PUBLIC_VLAN_ID
+  fi
+
+  if [ -n "$PRIVATE_VLAN_ID" ]; then
+    echo 
+    echo PRIVATE_VLAN=$PUBLIC_IFACE.$PRIVATE_VLAN_ID
+    echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID
+  fi
+
+  if [ -n "$MASQ_VLAN_ID" ]; then
+    echo 
+    echo MASQ_VLAN=$PUBLIC_IFACE.$MASQ_VLAN_ID
+    echo MASQ_BRIDGE=$BRIDGE_PREFIX$MASQ_BRIDGE_ID
+  fi
 
-if [ -n "$MASQ_VLAN_ID" ]; then
-  echo 
-  echo MASQ_VLAN=$PUBLIC_IFACE.$MASQ_VLAN_ID
-  echo MASQ_BRIDGE=$BRIDGE_PREFIX$MASQ_BRIDGE_ID
 fi
 
+
 )  > $HOSTINFRA