summaryrefslogtreecommitdiffstats
path: root/tests/run.sh
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2016-07-25 13:05:11 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-25 13:05:12 +0000
commit8ac6d9d2da1ba1f041b6191d89cedd0360be3f4e (patch)
tree85fb0952cd7ab48f7ee0c252a80fedfede24ad4c /tests/run.sh
parent011b1f8b9d28462d24e210c6020ba6c4138abf9f (diff)
parent05b597bcefa30208b3bfd3426b8bf5eb48252e2a (diff)
Merge "Move block code inside Apex section"
Diffstat (limited to 'tests/run.sh')
-rwxr-xr-xtests/run.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/run.sh b/tests/run.sh
index 0d9e08a0..e2ae595d 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -80,14 +80,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