diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-11 08:26:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 08:26:09 +0000 |
| commit | 08bde71385047eefcd7ac6aa211df5a83c145bdb (patch) | |
| tree | 1ba68fe67126488db7d9559fed38592b33636adf /mcp/scripts | |
| parent | 8007028f48b57243c428cdc9ebbbc168c2e373cc (diff) | |
| parent | d5dacf7b42b2839ca743520d8e845bb1e6bb67b9 (diff) | |
Merge "[baremetal] PDF: Use net_admin for MaaS PXE net" into stable/euphrates
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 |