summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-12 15:51:22 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-12 15:51:22 +0000
commit2b0a1581730e5a96c6e8949237bb54d4d0ea2571 (patch)
treeab680eaf7974e6002387be9b013c180243090e8e /ci
parent5c2d26dc7c9fd1abb531a8fedd9982383bf2367e (diff)
parent15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (diff)
Merge "[baremetal] Move all MaaS PXE net config to PDF"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index fc44832f5..eacfe8cf0 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -349,10 +349,6 @@ eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")"
export CLUSTER_DOMAIN=${cluster_domain}
-# Use MaaS PXE network defined via PDF admin network if available
-MAAS_PXE_NETWORK=${parameters__param_opnfv_infra_maas_node01_deploy_address:-${MAAS_PXE_NETWORK}}
-export MAAS_PXE_NETWORK=${MAAS_PXE_NETWORK%.*}.0
-
# Serialize vnode data as '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]'
for node in "${virtual_nodes[@]}"; do
virtual_custom_ram="virtual_${node}_ram"
@@ -403,7 +399,7 @@ fi
# Map PDF networks 'admin', 'mgmt', 'private' and 'public' to bridge names
BR_NAMES=('admin' 'mgmt' 'private' 'public')
BR_NETS=( \
- "${MAAS_PXE_NETWORK}" \
+ "${paramaters__param_opnfv_infra_maas_pxe_address}" \
"${parameters__param_opnfv_infra_config_address}" \
"${parameters__param_opnfv_openstack_compute_node01_tenant_address}" \
"${parameters__param_opnfv_openstack_compute_node01_external_address}" \