From 14f806dee654b007758af6cc9cdbb9e1eaa79d63 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sun, 2 Aug 2015 10:40:26 +0200
Subject: [PATCH] launch_instance.sh: return error if nova-compute fails

If the nova-compute service is up but remains offline (XXX) in
nova-manage service list, the script gives up, returning 0 (success) as
the exit code.

This patch makes this case return 1 (error) instead which is consistent
with similar cases in the script.

Change-Id: Ia6945569255a7cd9796930edff21ffcfc333cc1d
---
 labs/scripts/test/launch_instance.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/scripts/test/launch_instance.sh b/labs/scripts/test/launch_instance.sh
index 879d4fc5..d16166d9 100755
--- a/labs/scripts/test/launch_instance.sh
+++ b/labs/scripts/test/launch_instance.sh
@@ -127,9 +127,9 @@ function wait_for_nova_compute {
                 grep -q "start/running"; then
             if [ $cnt -eq 300 ]; then
                 # This should never happen.
-                echo "SUM ERROR nova-compute remains XXX while up."
+                echo "SUM ABORT nova-compute remains XXX while up."
                 echo "Aborting."
-                exit
+                exit 1
             fi
             echo -n .
         else