summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-01-30 14:49:44 +0100
committerDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-01-30 14:50:34 +0100
commitc42a9c8248381e33c4fd7155eeb15df7937d411b (patch)
treefebb760ec159accb30bb448780f9f98268f6ef64 /tools
parent324e79bac3985fc3e2599c5d0567fec59a217418 (diff)
Minor bug fix
Integration test in progress Change-Id: I12cb78afcfeb1cd377e1d89e6761ee9c6ab3487c Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/keystone/run.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/keystone/run.sh b/tools/keystone/run.sh
index d0a2b06..0389f6f 100755
--- a/tools/keystone/run.sh
+++ b/tools/keystone/run.sh
@@ -20,7 +20,7 @@ set -o pipefail
INSTALLER_IP=10.20.0.2
# Runs on the jumphost
# if running as part of Jenkins job, read and create the files from/in WORKSPACE
-WORKSPACE=${WORKSPACE:-/root}
+WORKSPACE=${WORKSPACE:-"/root"}
usage() {
echo "usage: $0 -a <installer_ip> -t (controller|compute) -r <runnable_script.sh> -d <data_file> -o <output_file>" >&2
@@ -65,6 +65,7 @@ case $1 in
;;
esac
shift # past argument or value
+done
installer_ip=${installer_ip:-$INSTALLER_IP}
data=${data:-""}
@@ -95,6 +96,7 @@ function run_on_target() {
sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
"ssh $ssh_options $1 \"cd /root/ && cat ${output}\"" > "${WORKSPACE}/${output}"
fi
+
}
target_info=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
@@ -103,4 +105,4 @@ sed 's/ //g') &> /dev/null
for machine in ${target_info} ; do
run_on_target $machine
-done
+done \ No newline at end of file