aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-08 01:20:47 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-31 01:07:24 +0100
commitbc7d5768e78e0197efbc08f289280dc39eb4f05e (patch)
treecebc65606129228a2e90ec5c6ac01d3cafb95230 /ci
parenta22cd535a867692233a61bc9a64114a6daf4aad0 (diff)
[baremetal] Move all MaaS PXE net config to PDF
- s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars; - patches: pharos: Add MaaS PXE network to installer adapter; - runtime.yml{,.template}: move to installer adapter, update pod_config.yml example; - drop MAAS_PXE_NETWORK global env var, now read strictly from PDF; JIRA: FUEL-313 Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 15e982f0d00dbcc72be2f5b25dab34b3f3efd912)
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 fe2eb14d4..bf6b6be0f 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -348,10 +348,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"
@@ -387,7 +383,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}" \