Revision c589ef4c

b/conf/snf-network.conf
1 1
STATE_DIR=/var/lib/snf-network
2 2

  
3
ENABLE_MASQ=false
3
ENABLE_AUTO_CONF_HOOKS=false
4 4

  
5
ENABLE_EBTABLES=false
5
# public network with ip-less routing and physical VLANs
6
# private networks bridged on physical VLANs
7
GRNET_SETUP=true
6 8

  
7
ENABLE_AUTO_CONF_HOOKS=false
9
# one bridge for all (public, private - ebtables, masq)
10
GENERIC_SETUP=false
b/snf-network-build-node-infra
25 25
echo "# node's public interface MAC" 
26 26
echo PUBLIC_MAC=$PUBLIC_MAC
27 27

  
28
if [ -n "$PUBLIC_VLAN_ID" ]; then
29
  echo 
30
  echo PUBLIC_VLAN=$PUBLIC_IFACE.$PUBLIC_VLAN_ID
31
fi
28
if $GENERIC_SETUP; then
32 29

  
33
if [ -n "$PRIVATE_VLAN_ID" ]; then
34
  echo 
35
  echo PRIVATE_VLAN=$PUBLIC_IFACE.$PRIVATE_VLAN_ID
36
  echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID
37
fi
30
  echo MASQ_BRIDGE=$PUBLIC_BRIDGE
31

  
32
elif $GRNET_SETUP; then
33

  
34
  if [ -n "$PUBLIC_VLAN_ID" ]; then
35
    echo 
36
    echo PUBLIC_VLAN=$PUBLIC_IFACE.$PUBLIC_VLAN_ID
37
  fi
38

  
39
  if [ -n "$PRIVATE_VLAN_ID" ]; then
40
    echo 
41
    echo PRIVATE_VLAN=$PUBLIC_IFACE.$PRIVATE_VLAN_ID
42
    echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID
43
  fi
44

  
45
  if [ -n "$MASQ_VLAN_ID" ]; then
46
    echo 
47
    echo MASQ_VLAN=$PUBLIC_IFACE.$MASQ_VLAN_ID
48
    echo MASQ_BRIDGE=$BRIDGE_PREFIX$MASQ_BRIDGE_ID
49
  fi
38 50

  
39
if [ -n "$MASQ_VLAN_ID" ]; then
40
  echo 
41
  echo MASQ_VLAN=$PUBLIC_IFACE.$MASQ_VLAN_ID
42
  echo MASQ_BRIDGE=$BRIDGE_PREFIX$MASQ_BRIDGE_ID
43 51
fi
44 52

  
53

  
45 54
)  > $HOSTINFRA

Also available in: Unified diff