summaryrefslogtreecommitdiffstats
path: root/mcp
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-08 02:19:35 +0100
commit9136aef95f77a1f26175929caedfe6ae662bbbd8 (patch)
tree2e6c6c1875e8443bcf5b5c1307ca1d54dae065b1 /mcp
parentfbea9fae7a16f1375f7413ccd46146b015fc87ff (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>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template2
-rw-r--r--mcp/scripts/globals.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
index 1445917e6..342dc77aa 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-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