diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-12 13:24:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-12 13:24:07 +0000 |
| commit | 798c781b97a6a92b01f3f4cd0c85b50e92648627 (patch) | |
| tree | 1037226036567833d1f3a22f35eca2e915d68b64 /mcp/scripts/globals.sh | |
| parent | fd5dd042186d04be3dd88b91d6208d4fbaf8bdec (diff) | |
| parent | b666bc50b2b8b1bb8cde5cdab280f0409bde4958 (diff) | |
Merge "[cleanup] FN VMs: Fold user-data templates"
Diffstat (limited to 'mcp/scripts/globals.sh')
| -rw-r--r-- | mcp/scripts/globals.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 54f015cf6..d95448d45 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -16,7 +16,6 @@ export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} export MCPCONTROL_PREFIX=${MCPCONTROL_PREFIX:-24} -export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3} # Derived from above global vars, not overideable export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" |