diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-08 01:20:47 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 01:07:24 +0100 |
| commit | bc7d5768e78e0197efbc08f289280dc39eb4f05e (patch) | |
| tree | cebc65606129228a2e90ec5c6ac01d3cafb95230 /mcp/scripts | |
| parent | a22cd535a867692233a61bc9a64114a6daf4aad0 (diff) | |
[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 15e982f0d00dbcc72be2f5b25dab34b3f3efd912)
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/globals.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 9ef9eba12..fe8d7a3f9 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -14,9 +14,6 @@ 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} -# 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 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}" |