From 4f68016daa6b8bff677b9915b411fda388f5505d Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <aostapenko@mirantis.com>
Date: Fri, 9 Jun 2017 14:39:18 +0300
Subject: [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>
---
 ci/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ci')

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
-- 
cgit 1.2.3-korg