From 15e982f0d00dbcc72be2f5b25dab34b3f3efd912 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 8 Dec 2017 01:20:47 +0100 Subject: [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 --- ci/deploy.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ci') 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 ',,|,,[...]' 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}" \ -- cgit 1.2.3-korg