Revision 0cd0e783
| b/snf-network-build-node-infra | ||
|---|---|---|
| 28 | 28 |
cat $INFRA |
| 29 | 29 |
|
| 30 | 30 |
echo |
| 31 |
echo "# node's interface"
|
|
| 32 |
echo NODE_IFACE=$NODE_IFACE
|
|
| 31 |
echo "# node's primary interface"
|
|
| 32 |
echo NODE_PRIMARY_IFACE=$NODE_IFACE
|
|
| 33 | 33 |
|
| 34 |
echo
|
|
| 35 |
echo "# node's MAC"
|
|
| 34 |
echo |
|
| 35 |
echo "# node's MAC" |
|
| 36 | 36 |
echo NODE_MAC=$NODE_MAC |
| 37 | 37 |
|
| 38 |
echo
|
|
| 39 |
echo "# node's IPs"
|
|
| 38 |
echo |
|
| 39 |
echo "# node's IPs" |
|
| 40 | 40 |
echo NODE_IPS=\"$NODE_IPS\" |
| 41 | 41 |
|
| 42 |
echo
|
|
| 43 |
echo "# node's Gateway"
|
|
| 42 |
echo |
|
| 43 |
echo "# node's Gateway" |
|
| 44 | 44 |
echo NODE_GW=$NODE_GW |
| 45 | 45 |
|
| 46 | 46 |
case $SETUP in |
| 47 |
GRNET) |
|
| 47 |
GRNET) |
|
| 48 |
echo |
|
| 49 |
echo "# node's primary interface" |
|
| 50 |
echo NODE_IFACE=$NODE_IFACE |
|
| 51 |
|
|
| 48 | 52 |
if [ -n "$PUBLIC_VLAN_ID" ]; then |
| 49 |
echo
|
|
| 53 |
echo |
|
| 50 | 54 |
echo PUBLIC_VLAN=$NODE_IFACE.$PUBLIC_VLAN_ID |
| 51 | 55 |
echo PUBLIC_LINK=$ROUTING_TABLE |
| 52 | 56 |
fi |
| 53 | 57 |
|
| 54 | 58 |
if [ -n "$PRIVATE_VLAN_ID" ]; then |
| 55 |
echo
|
|
| 59 |
echo |
|
| 56 | 60 |
echo PRIVATE_VLAN=$NODE_IFACE.$PRIVATE_VLAN_ID |
| 57 | 61 |
echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID |
| 58 | 62 |
fi |
| ... | ... | |
| 60 | 64 |
GENERIC) |
| 61 | 65 |
echo |
| 62 | 66 |
echo PUBLIC_LINK=$PUBLIC_BRIDGE |
| 67 |
echo |
|
| 68 |
echo "# node's primary interface" |
|
| 69 |
echo NODE_IFACE=$PUBLIC_BRIDGE |
|
| 63 | 70 |
;; |
| 64 | 71 |
esac |
| 65 | 72 |
|
| b/snf-network-configure-interfaces | ||
|---|---|---|
| 12 | 12 |
INTERFACES=$STATE_DIR/interfaces |
| 13 | 13 |
HOSTINFRA=$STATE_DIR/infra |
| 14 | 14 |
|
| 15 |
if [ ! -e "$HOSTINFRA" ]; then
|
|
| 16 |
echo "A host infra file must exist"
|
|
| 15 |
if [ ! -e "$HOSTINFRA" ]; then |
|
| 16 |
echo "A host infra file must exist" |
|
| 17 | 17 |
echo "Run snf-network-build-host-infra" |
| 18 | 18 |
exit 1 |
| 19 | 19 |
fi |
| ... | ... | |
| 23 | 23 |
DONOTIFUP=false |
| 24 | 24 |
|
| 25 | 25 |
check_iface(){
|
| 26 |
if [ -n "$1" -a -e /proc/sys/net/ipv4/conf/$1 ]; then
|
|
| 26 |
if [ -n "$1" -a -e /proc/sys/net/ipv4/conf/$1 ]; then |
|
| 27 | 27 |
echo Interface $1 already exist! Please check |
| 28 | 28 |
export DONOTIFUP=true |
| 29 | 29 |
fi |
| ... | ... | |
| 48 | 48 |
cat<<EOF |
| 49 | 49 |
auto $PUBLIC_BRIDGE |
| 50 | 50 |
iface $PUBLIC_BRIDGE inet manual |
| 51 |
bridge_ports $NODE_IFACE |
|
| 51 |
bridge_ports $NODE_PRIMARY_IFACE
|
|
| 52 | 52 |
bridge_stp off |
| 53 | 53 |
bridge_fd 2 |
| 54 |
up for ip in $NODE_IPS; do ip addr add \$ip dev $PUBLIC_BRIDGE; done
|
|
| 54 |
up for ip in $NODE_IPS; do ip addr add \$ip dev $PUBLIC_BRIDGE; done |
|
| 55 | 55 |
up ip route add default via $NODE_GW dev $PUBLIC_BRIDGE |
| 56 |
post-up ip link set $PUBLIC_BRIDGE address $NODE_MAC
|
|
| 56 |
post-up ip link set $PUBLIC_BRIDGE address $NODE_MAC |
|
| 57 | 57 |
|
| 58 | 58 |
EOF |
| 59 | 59 |
|
| ... | ... | |
| 76 | 76 |
bridge_ports $PRIVATE_VLAN |
| 77 | 77 |
bridge_stp off |
| 78 | 78 |
bridge_fd 2 |
| 79 |
post-up ip link set $PRIVATE_BRIDGE address $NODE_MAC
|
|
| 79 |
post-up ip link set $PRIVATE_BRIDGE address $NODE_MAC |
|
| 80 | 80 |
|
| 81 | 81 |
EOF |
| 82 |
fi
|
|
| 82 |
fi |
|
| 83 | 83 |
|
| 84 | 84 |
if [ -n "$PRIVATE_VLAN_ID_OFFSET" ]; then |
| 85 | 85 |
HELPER="$PRIVATE_VLAN_ID_MIN $PRIVATE_VLAN_ID_MAX $PRIVATE_VLAN_ID_OFFSET" |
| ... | ... | |
| 91 | 91 |
|
| 92 | 92 |
EOF |
| 93 | 93 |
fi |
| 94 |
|
|
| 94 |
|
|
| 95 | 95 |
fi |
| 96 | 96 |
|
| 97 | 97 |
) > $INTERFACES |
Also available in: Unified diff