From d4ab072aeab143ce72e4b81122d4580915a4ad1a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 16 Dec 2017 23:29:54 +0100 Subject: [baremetal] Move salt master IP to PXE/admin Use PXE/admin network for salt traffic from/to all minions except cfg01, mas01. This allows us to drop the route to admin net from cfg01. Change-Id: Ic2526f1ff77afe5d92ced900971f4c8f78d2d8a2 Signed-off-by: Alexandru Avadanii --- mcp/scripts/lib.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mcp/scripts') diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 3dee9c51f..6baed8c81 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -220,8 +220,7 @@ function 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. - # FIXME(alav): The same applies for "fuel1" virsh network. - for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" @@ -255,8 +254,8 @@ function create_vms { # prepare network args net_args=" --network network=mcpcontrol,model=virtio" - if [ "${vnode_data[0]}" = "mas01" ]; then - # MaaS node's 3rd interface gets connected to PXE/Admin Bridge + if [ "${DEPLOY_TYPE:-}" = 'baremetal' ]; then + # 3rd interface gets connected to PXE/Admin Bridge (cfg01, mas01) vnode_networks[2]="${vnode_networks[0]}" fi for net in "${vnode_networks[@]:1}"; do -- cgit 1.2.3-korg