Distinguish between GRNET and generic setup

[snf-network] / conf / infra.conf

diff --git a/conf/infra.conf b/conf/infra.conf
index 8a188f3..1380811 100644 (file)
--- a/conf/infra.conf
+++ b/conf/infra.conf
@@ -1,12 +1,27 @@
-ROUTER=dev88
-ROUTER_MAC=e4:11:5b:b2:8d:ca
+# Generic case
+# iface where all tap will be bridged
+PUBLIC_BRIDGE=
+
+# brigde prefix used for private networks
+BRIDGE_PREFIX=prv
+# GRNET specific configuration 
+# one vlan for IP less/proxy ARP routing of public IPs 
+PUBLIC_VLAN_ID=201
+
+# one vlan for bridging private lans with ebtables for filtering
+PRIVATE_BRIDGE_ID=0
+PRIVATE_VLAN_ID=2990
+
+# in case of private lans mac prefix is used for isolation
 MAC_MASK=ff:ff:ff:0:0:0
 
-PUBLIC_INTERFACE=eth0
-PUBLIC_VLAN=eth0.201
-PUBLIC_BRIDGE=br0
-PRIVATE_VLAN=eth0.2990
-PRIVATE_BRIDGE=br2990
-MASQ_VLAN=eth0.2991
-MASQ_BRIDGE=br2991
+# one bridge per vlan for expensive private networks
+#PRIVATE_BRIDGE_ID_RANGE=`seq 2991 2999`
+PRIVATE_VLAN_ID_OFFSET=2990
+PRIVATE_VLAN_ID_MIN=1
+PRIVATE_VLAN_ID_MAX=5
+
 
+# a bridge for masquerading
+MASQ_BRIDGE_ID=10
+MASQ_VLAN_ID=2999