summaryrefslogtreecommitdiffstats
path: root/mcp/scripts
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 15:35:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-18 15:35:56 +0000
commita4abff17c7b71408762353bb1ef52d9ffbec2fb7 (patch)
treecee4340941dac799e7aa01ff3bc642f158846b74 /mcp/scripts
parent8494ec245aa24f00f2412d0f9d1e1e32591708d7 (diff)
parentd4ab072aeab143ce72e4b81122d4580915a4ad1a (diff)
Merge "[baremetal] Move salt master IP to PXE/admin"
Diffstat (limited to 'mcp/scripts')
-rw-r--r--mcp/scripts/lib.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index a1f347cb6..982cc37fd 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -221,8 +221,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}"
@@ -256,8 +255,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