Move mcp.rsa to /var/lib/opnfv

JIRA: FUEL-280

Change-Id: I1e07b0e1597b2a1e4a92e1274f89dda62cb81bb8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index f73fdfc..4b64000 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -139,9 +139,7 @@ DEPLOY_TYPE='baremetal'
 OPNFV_BRIDGES=('pxebr' 'mgmt' 'internal' 'public')
 URI_REGEXP='(file|https?|ftp)://.*'
 
-# NOTE: When this script runs with sudo, key will land in /root/opnfv/mcp.rsa,
-# unless SSH_KEY is set to point to non-root user's home (e.g. via env var).
-export SSH_KEY=${SSH_KEY:-"${HOME}/opnfv/mcp.rsa"}
+export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"}
 export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
 export MAAS_IP=${MAAS_IP:-192.168.10.3}
 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
@@ -262,7 +260,6 @@ if ! virsh list >/dev/null 2>&1; then
 fi
 
 # Validate mandatory arguments are set
-# FIXME(armband): Bring back support for BASE_CONFIG_URI
 if [ -z "${TARGET_LAB}" ] || [ -z "${TARGET_POD}" ] || \
    [ -z "${DEPLOY_SCENARIO}" ]; then
     notify "[ERROR] At least one of the mandatory args is missing!\n" 1>&2
@@ -275,7 +272,7 @@ set -x
 # Enable the automatic exit trap
 trap do_exit SIGINT SIGTERM EXIT
 
-# Set no restrictive umask so that Jenkins can removeeee any residuals
+# Set no restrictive umask so that Jenkins can remove any residuals
 umask 0000
 
 clean

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 1812663..38f39fb 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -17,7 +17,7 @@ generate_ssh_key() {
   fi
 
   [ -f "${mcp_ssh_key}" ] || ssh-keygen -f "${mcp_ssh_key}" -N ''
-  install -D -o "${user}" -m 0600 "${mcp_ssh_key}" "${SSH_KEY}"
+  sudo install -D -o "${user}" -m 0600 "${mcp_ssh_key}" "${SSH_KEY}"
 }
 
 get_base_image() {