diff --git a/deployment/libvirt/README.rst b/deployment/libvirt/README.rst index b5f0396a..7f80a214 100644 --- a/deployment/libvirt/README.rst +++ b/deployment/libvirt/README.rst @@ -22,10 +22,8 @@ an interactive shell that configures everything. Here's an example:: export CONTROLLER=madcloud export COMPUTE=madnode export BRIDGE_INTERFACE=madbr - export INTERNAL_NETWORK=172.30.20.0/24 - export INTERNAL_IP=172.30.20.1/24 - export EXTERNAL_NETWORK=192.168.20.0/24 - export EXTERNAL_IP=192.168.20.1/24 + export EXTERNAL_NETWORK=172.30.20.0/24 + export EXTERNAL_IP=172.30.20.1/24 There is also a script ``cleanup_network.sh`` that will remove networking configuration from libvirt. diff --git a/deployment/libvirt/destroy_network.sh b/deployment/libvirt/destroy_network.sh index 04e4de58..ff47188c 100755 --- a/deployment/libvirt/destroy_network.sh +++ b/deployment/libvirt/destroy_network.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr} -INTERNAL_NETWORK=${INTERNAL_NETWORK:-10.10.10.0/24} -INTERNAL_IP=${INTERNAL_IP:-10.10.10.1/24} -EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-192.168.204.0/24} -EXTERNAL_IP=${EXTERNAL_IP:-192.168.204.1/24} +EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-10.10.10.0/24} +EXTERNAL_IP=${EXTERNAL_IP:-10.10.10.1/24} for i in {1..4}; do BRIDGE_INTERFACE_NAME=${BRIDGE_INTERFACE}$i diff --git a/deployment/libvirt/setup_network.sh b/deployment/libvirt/setup_network.sh index 7d4ed8a1..13f211bf 100755 --- a/deployment/libvirt/setup_network.sh +++ b/deployment/libvirt/setup_network.sh @@ -19,10 +19,8 @@ done shift $((OPTIND-1)) BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr} -INTERNAL_NETWORK=${INTERNAL_NETWORK:-10.10.10.0/24} -INTERNAL_IP=${INTERNAL_IP:-10.10.10.1/24} -EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-192.168.204.0/24} -EXTERNAL_IP=${EXTERNAL_IP:-192.168.204.1/24} +EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-10.10.10.0/24} +EXTERNAL_IP=${EXTERNAL_IP:-10.10.10.1/24} if [[ -r /sys/class/net/${BRIDGE_INTERFACE}1 ]]; then 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 done -sudo ifconfig ${BRIDGE_INTERFACE}1 $INTERNAL_IP up -sudo ifconfig ${BRIDGE_INTERFACE}2 $EXTERNAL_IP up +sudo ifconfig ${BRIDGE_INTERFACE}1 $EXTERNAL_IP up +sudo ifconfig ${BRIDGE_INTERFACE}2 up sudo ifconfig ${BRIDGE_INTERFACE}3 up sudo ifconfig ${BRIDGE_INTERFACE}4 up sudo iptables -t nat -A POSTROUTING -s $EXTERNAL_NETWORK -j MASQUERADE