aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrii Ostapenko <aostapenko@mirantis.com>2017-06-09 14:39:18 +0300
committerAndrii Ostapenko <aostapenko@mirantis.com>2017-06-09 15:46:38 +0300
commit4f68016daa6b8bff677b9915b411fda388f5505d (patch)
tree2c3779e763bc30718d32b7f4d764494612ab9aae
parentd433573b98d288feaff518dd3ac9a5b19e35f1e6 (diff)
[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>
-rwxr-xr-xci/deploy.sh4
-rwxr-xr-xmcp/reclass/scripts/infra.sh1
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 500d26e41..54b090254 100755
--- 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 c88c061fd..07ee2c75d 100755
--- 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