[mcp] Copy ssh key to tmp dir

Copy ssh key to tmp dir to be able to retrieve
OS credentials by releng/utils/fetch_os_creds.sh

Also adds 'set -x' to ci/deploy.sh

Change-Id: I056c626288862f84f47c947461894730ce0483ac
Signed-off-by: Andrii Ostapenko <aostapenko@mirantis.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 500d26e..54b0902 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 ##############################################################################
 # Copyright (c) 2015 Ericsson AB and others.
 # jonas.bjurel@ericsson.com
@@ -248,7 +248,7 @@ esac
 
 export CLUSTER_DOMAIN
 export SSH_KEY=mcp.rsa
-export SALT_MASTER=192.168.10.100
+export SALT_MASTER=$SALT_MASTER_IP
 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
 
 ./infra.sh

diff --git a/mcp/reclass/scripts/infra.sh b/mcp/reclass/scripts/infra.sh
index c88c061..07ee2c7 100755 (executable)
--- a/mcp/reclass/scripts/infra.sh
+++ b/mcp/reclass/scripts/infra.sh
@@ -8,6 +8,7 @@ apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm
 
 # generate ssh key
 [ -f $SSH_KEY ] || ssh-keygen -f $SSH_KEY -N ''
+cp $SSH_KEY /tmp/
 
 # get base image
 mkdir -p images