From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Mon, 25 Jul 2016 13:05:11 +0000 (+0000)
Subject: Merge "Move block code inside Apex section"
X-Git-Tag: colorado.1.0~42
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8ac6d9d2da1ba1f041b6191d89cedd0360be3f4e;hp=011b1f8b9d28462d24e210c6020ba6c4138abf9f;p=doctor.git

Merge "Move block code inside Apex section"
---

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