diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-04 20:28:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-04 20:28:42 +0000 |
| commit | f69a28ea02cc6a53d3b3d289576b17fbb31a67cc (patch) | |
| tree | 2b5d9617f3b45c55507ca1d4dba2103cdaf4cf86 /ci | |
| parent | 61b418dd534fe09e2550248d6d909a2399a18d27 (diff) | |
| parent | 45b22fab76f84cdbf71a6693dc42f24edaa4334e (diff) | |
Merge "ci/deploy.sh: Move global vars to separate file"
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 |