From a760c973e420371b07ac1739ba2d32a1df87226f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 10 Sep 2017 22:04:58 +0200 Subject: salt master, maas: Move mcpcontrol to 10.20.0.0/24 Use INSTALLER_IP Jenkins param instead of SALT_MASTER_IP, allowing us to drop SALT_MASTER_IP completely from releng. mcpcontrol IP changes: - 192.168.10.100 becomes 10.20.0.2 (align with legacy Fuel master); - 192.168.10.3 becomes 10.20.0.3 (baremetal MaaS address); JIRA: FUEL-285 Change-Id: I6e2d44c3a8b43846196bd64191735214167a76ce Signed-off-by: Alexandru Avadanii --- mcp/scripts/lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mcp/scripts/lib.sh') diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index e123e5231..650c63b16 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -65,7 +65,8 @@ create_networks() { # create required networks, including constant "mcpcontrol" # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure # we delete the old "pxe" virtual network, or it would cause IP conflicts. - for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + # FIXME(alav): The same applies for "fuel1" virsh network. + for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" -- cgit 1.2.3-korg