diff options
| -rwxr-xr-x | ci/deploy.sh | 4 | ||||
| -rwxr-xr-x | mcp/reclass/scripts/infra.sh | 1 |
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 |