openstack/training-guides
Code Issues Proposed changes

labs: exit if ssh returns error value

Browse Source 
With this changeset, osbash host scripts abort installation over ssh if
script execution in the VM returns an error. The patch has no effect on
installations using VirtualBox guest-addons.

Change-Id: Ibc0b297f44289cfe37e07fad1c0fcef1a30abfb2
This commit is contained in:
Roger Luethi 2014-09-09 16:35:18 +02:00
parent 7dbce8f985
commit 412db49c57
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
labs/lib/osbash/functions.host
View File

@ -127,7 +127,16 @@ function ssh_exec_script {
local prefix=$(get_next_prefix "$LOG_DIR" "auto")
local log_path=$LOG_DIR/${prefix}_${script_name}.auto
vm_ssh "$ssh_port" "bash $remote_path && rm -vf $remote_path" > "$log_path" 2>&1
local rc=0
vm_ssh "$ssh_port" "bash $remote_path && rm -vf $remote_path" \
> "$log_path" 2>&1 || rc=$?
if [ $rc -ne 0 ]; then
echo >&2
echo "ERROR: ssh returned status $rc for $remote_path" |
tee >&2 -a "$LOG_DIR/error.log"
# kill osbash host scripts
kill -- -$$
fi
echo -en "\n$(date) done"
}