diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-07 23:24:37 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-09 18:22:11 +0100 |
| commit | d5dacf7b42b2839ca743520d8e845bb1e6bb67b9 (patch) | |
| tree | fa26c1f3fbd44ab3a23f3d52cc7022453277268a /mcp/scripts | |
| parent | e770336f88637e6c0b51ba230b54837f9258414d (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)
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/globals.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |