aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 20:28:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-04 20:28:42 +0000
commitf69a28ea02cc6a53d3b3d289576b17fbb31a67cc (patch)
tree2b5d9617f3b45c55507ca1d4dba2103cdaf4cf86 /mcp
parent61b418dd534fe09e2550248d6d909a2399a18d27 (diff)
parent45b22fab76f84cdbf71a6693dc42f24edaa4334e (diff)
Merge "ci/deploy.sh: Move global vars to separate file"
Diffstat (limited to 'mcp')
-rw-r--r--mcp/scripts/globals.sh21
-rwxr-xr-xmcp/scripts/log.sh2
2 files changed, 23 insertions, 0 deletions
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
new file mode 100644
index 000000000..6dabe65fe
--- /dev/null
+++ b/mcp/scripts/globals.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+##############################################################################
+# Copyright (c) 2017 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
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# Global variables
+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}"
diff --git a/mcp/scripts/log.sh b/mcp/scripts/log.sh
index 1ae0953af..8bc7c4422 100755
--- a/mcp/scripts/log.sh
+++ b/mcp/scripts/log.sh
@@ -14,6 +14,8 @@ DEPLOY_LOG=$1
OPNFV_TMP_LOG="opnfv_fuel_logs"
[ -n "${DEPLOY_LOG}" ] || exit 0
+# shellcheck disable=SC1091
+[ -n "${SSH_OPTS}" ] || source globals.sh
# ssh to cfg01
# shellcheck disable=SC2086,2087