summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Goncalves <carlos.goncalves@neclab.eu>2016-07-21 12:14:30 +0000
committerCarlos Goncalves <mail@cgoncalves.pt>2016-07-21 14:27:45 +0200
commit05b597bcefa30208b3bfd3426b8bf5eb48252e2a (patch)
tree14b50bd8cd507199a99dc4baadb87ff83af5094b
parent5a189baf2f99032a0c28992fa47e372d5291c2d2 (diff)
Move block code inside Apex section
Change-Id: I87c971fedc6106165bfe0716a475edad5c43640c Signed-off-by: Carlos Goncalves <carlos.goncalves@neclab.eu>
-rwxr-xr-xtests/run.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/run.sh b/tests/run.sh
index 3e2fbab5..29dd056a 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -78,14 +78,13 @@ prepare_compute_ssh() {
# get ssh key from installer node
if [[ "$INSTALLER_TYPE" == "apex" ]] ; then
sudo scp $ssh_opts root@"$INSTALLER_IP":/home/stack/.ssh/id_rsa instack_key
+ sudo chown $(whoami):$(whoami) instack_key
+ chmod 400 instack_key
+ ssh_opts_cpu+=" -i instack_key"
elif [[ "$INSTALLER_TYPE" == "local" ]] ; then
echo "INSTALLER_TYPE set to 'local'. Assuming SSH keys already exchanged with $COMPUTE_HOST"
fi
- sudo chown $(whoami):$(whoami) instack_key
- chmod 400 instack_key
- ssh_opts_cpu+=" -i instack_key"
-
# verify ssh to target compute host
ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" 'exit'
if [[ $? -ne 0 ]] ; then