Merge "deployment: libvirt: correct internal/external net"
This commit is contained in:
commit
dd9909b411
|
@ -22,10 +22,8 @@ an interactive shell that configures everything. Here's an example::
|
||||||
export CONTROLLER=madcloud
|
export CONTROLLER=madcloud
|
||||||
export COMPUTE=madnode
|
export COMPUTE=madnode
|
||||||
export BRIDGE_INTERFACE=madbr
|
export BRIDGE_INTERFACE=madbr
|
||||||
export INTERNAL_NETWORK=172.30.20.0/24
|
export EXTERNAL_NETWORK=172.30.20.0/24
|
||||||
export INTERNAL_IP=172.30.20.1/24
|
export EXTERNAL_IP=172.30.20.1/24
|
||||||
export EXTERNAL_NETWORK=192.168.20.0/24
|
|
||||||
export EXTERNAL_IP=192.168.20.1/24
|
|
||||||
|
|
||||||
There is also a script ``cleanup_network.sh`` that will remove networking
|
There is also a script ``cleanup_network.sh`` that will remove networking
|
||||||
configuration from libvirt.
|
configuration from libvirt.
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
|
BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
|
||||||
INTERNAL_NETWORK=${INTERNAL_NETWORK:-10.10.10.0/24}
|
EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-10.10.10.0/24}
|
||||||
INTERNAL_IP=${INTERNAL_IP:-10.10.10.1/24}
|
EXTERNAL_IP=${EXTERNAL_IP:-10.10.10.1/24}
|
||||||
EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-192.168.204.0/24}
|
|
||||||
EXTERNAL_IP=${EXTERNAL_IP:-192.168.204.1/24}
|
|
||||||
|
|
||||||
for i in {1..4}; do
|
for i in {1..4}; do
|
||||||
BRIDGE_INTERFACE_NAME=${BRIDGE_INTERFACE}$i
|
BRIDGE_INTERFACE_NAME=${BRIDGE_INTERFACE}$i
|
||||||
|
|
|
@ -19,10 +19,8 @@ done
|
||||||
shift $((OPTIND-1))
|
shift $((OPTIND-1))
|
||||||
|
|
||||||
BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
|
BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
|
||||||
INTERNAL_NETWORK=${INTERNAL_NETWORK:-10.10.10.0/24}
|
EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-10.10.10.0/24}
|
||||||
INTERNAL_IP=${INTERNAL_IP:-10.10.10.1/24}
|
EXTERNAL_IP=${EXTERNAL_IP:-10.10.10.1/24}
|
||||||
EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-192.168.204.0/24}
|
|
||||||
EXTERNAL_IP=${EXTERNAL_IP:-192.168.204.1/24}
|
|
||||||
|
|
||||||
if [[ -r /sys/class/net/${BRIDGE_INTERFACE}1 ]]; then
|
if [[ -r /sys/class/net/${BRIDGE_INTERFACE}1 ]]; then
|
||||||
echo "${BRIDGE_INTERFACE}1 exists, cowardly refusing to overwrite it, exiting..."
|
echo "${BRIDGE_INTERFACE}1 exists, cowardly refusing to overwrite it, exiting..."
|
||||||
|
@ -33,8 +31,8 @@ for i in {1..4}; do
|
||||||
sudo brctl addbr ${BRIDGE_INTERFACE}$i
|
sudo brctl addbr ${BRIDGE_INTERFACE}$i
|
||||||
done
|
done
|
||||||
|
|
||||||
sudo ifconfig ${BRIDGE_INTERFACE}1 $INTERNAL_IP up
|
sudo ifconfig ${BRIDGE_INTERFACE}1 $EXTERNAL_IP up
|
||||||
sudo ifconfig ${BRIDGE_INTERFACE}2 $EXTERNAL_IP up
|
sudo ifconfig ${BRIDGE_INTERFACE}2 up
|
||||||
sudo ifconfig ${BRIDGE_INTERFACE}3 up
|
sudo ifconfig ${BRIDGE_INTERFACE}3 up
|
||||||
sudo ifconfig ${BRIDGE_INTERFACE}4 up
|
sudo ifconfig ${BRIDGE_INTERFACE}4 up
|
||||||
sudo iptables -t nat -A POSTROUTING -s $EXTERNAL_NETWORK -j MASQUERADE
|
sudo iptables -t nat -A POSTROUTING -s $EXTERNAL_NETWORK -j MASQUERADE
|
||||||
|
|
Loading…
Reference in New Issue