From 0e81a56580b600631f996f99fb80370dd652b921 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 18 Nov 2015 16:21:37 +0100 Subject: [PATCH] [ospopulate] use '|| true' instead of 'if ! ...' Change-Id: I74f66c44d946ca3e83b5b222753d8d10b0b0b99c --- tools/ospopulate.bash | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/ospopulate.bash b/tools/ospopulate.bash index 5769605..06c4fdd 100755 --- a/tools/ospopulate.bash +++ b/tools/ospopulate.bash @@ -91,9 +91,7 @@ exit_on_failure "Unable to snapshot volume $VOL_NAME" # Backuping volume # Don't exit if this fails - as we may test platforms that don't # provide this feature -if ! cinder backup-create --display-name $VOLBACK_NAME $VOL_ID; then - : -fi +cinder backup-create --display-name $VOLBACK_NAME $VOL_ID || true ############################### @@ -220,9 +218,7 @@ description: > Hello world HOT template' > dummy_stack.yaml # Don't exit if this fails - as we may test platforms that don't # provide this feature -if ! heat stack-create -f dummy_stack.yaml $STACK_NAME; then - : -fi +heat stack-create -f dummy_stack.yaml $STACK_NAME || true # Wait for VM to be spawned before snapshotting the VM @@ -261,6 +257,4 @@ exit_on_failure "Unable to create VM Snapshot of $VM_NAME" # Create a ceilometer alarm # Don't exit if this fails - as we may test platforms that don't # provide this feature -if ! ceilometer alarm-create --name $ALARM_NAME --meter-name cpu_util --threshold 70.0; then - : -fi +ceilometer alarm-create --name $ALARM_NAME --meter-name cpu_util --threshold 70.0 || true