summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-07 23:24:37 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-09 18:22:11 +0100
commitd5dacf7b42b2839ca743520d8e845bb1e6bb67b9 (patch)
treefa26c1f3fbd44ab3a23f3d52cc7022453277268a
parente770336f88637e6c0b51ba230b54837f9258414d (diff)
[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 <Alexandru.Avadanii@enea.com> (cherry picked from commit 9136aef95f77a1f26175929caedfe6ae662bbbd8)
-rwxr-xr-xci/deploy.sh6
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template2
-rw-r--r--mcp/scripts/globals.sh2
3 files changed, 7 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b13e18e7e..fe2eb14d4 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -348,6 +348,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 '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]'
for node in "${virtual_nodes[@]}"; do
virtual_custom_ram="virtual_${node}_ram"
@@ -383,7 +387,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}" \
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index 1445917e6..342dc77aa 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -13,7 +13,7 @@ parameters:
opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
opnfv_net_mcpcontrol_mask: 255.255.255.0
- # These should be moved to pod_config.yml and read based on PDF admin net
+ # These should be moved to pod_config.yml and MAAS_PXE_NETWORK dropped
opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK}
opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3
opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index ce4f9ffe9..9ef9eba12 100644
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh
@@ -14,7 +14,7 @@ export SALT_MASTER=${INSTALLER_IP:-10.20.0.2}
export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3}
-# These should be determined from PDF later
+# Define a default network address, baremetal might override it via PDF
export MAAS_PXE_NETWORK=${MAAS_PXE_NETWORK:-192.168.11.0}
# Derivated from above global vars