From 9136aef95f77a1f26175929caedfe6ae662bbbd8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 7 Dec 2017 23:24:37 +0100 Subject: [baremetal] PDF: Use net_admin for MaaS PXE net While at it, fix another small issue where a variable (parameters__param_opnfv_maas_pxe_address) was used without being populated (defined in 'runtime.yml', which is not read using `parse_yaml`, like the scenario yml or the PDF expanded class, pod_config.yml). JIRA: FUEL-313 Change-Id: Iee88601d5420f55572bf90c8cf330afbedfb2e21 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ci/deploy.sh') diff --git a/ci/deploy.sh b/ci/deploy.sh index 1b4dd95c8..fc44832f5 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -349,6 +349,10 @@ 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 ',,|,,[...]' for node in "${virtual_nodes[@]}"; do virtual_custom_ram="virtual_${node}_ram" @@ -399,7 +403,7 @@ fi # Map PDF networks 'admin', 'mgmt', 'private' and 'public' to bridge names BR_NAMES=('admin' 'mgmt' 'private' 'public') BR_NETS=( \ - "${parameters__param_opnfv_maas_pxe_address}" \ + "${MAAS_PXE_NETWORK}" \ "${parameters__param_opnfv_infra_config_address}" \ "${parameters__param_opnfv_openstack_compute_node01_tenant_address}" \ "${parameters__param_opnfv_openstack_compute_node01_external_address}" \ -- cgit 1.2.3-korg