diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-03 19:30:12 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-05 15:25:14 +0000 |
| commit | 820721e04309d732e58b90b7a7d57db8136784e0 (patch) | |
| tree | 2b5d9617f3b45c55507ca1d4dba2103cdaf4cf86 /ci | |
| parent | 1423815e9c0bb31bbb7fba87017bb3a5df75e023 (diff) | |
ci/deploy.sh: Move global vars to separate file
log.sh should also work as standalone script, so factor out
global variables from <ci/deploy.sh> into <mcp/scripts/globals.sh>,
which should be sourced by log.sh when required variables are not set.
Change-Id: I5a5bb85ee5835f567d6910b11c137d95e2147714
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 45b22fab76f84cdbf71a6693dc42f24edaa4334e)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 3c4d9e436..990ab4036 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -150,17 +150,7 @@ USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0} INFRA_CREATION_ONLY=${INFRA_CREATION_ONLY:-0} NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} -export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} -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 -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}" +source "${DEPLOY_DIR}/globals.sh" # Variables below are disabled for now, to be re-introduced or removed later set +x |