diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-12 15:51:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-12 15:51:22 +0000 |
| commit | 2b0a1581730e5a96c6e8949237bb54d4d0ea2571 (patch) | |
| tree | ab680eaf7974e6002387be9b013c180243090e8e /mcp/scripts/globals.sh | |
| parent | 5c2d26dc7c9fd1abb531a8fedd9982383bf2367e (diff) | |
| parent | 15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (diff) | |
Merge "[baremetal] Move all MaaS PXE net config to PDF"
Diffstat (limited to 'mcp/scripts/globals.sh')
| -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}" |