From 3db52e4f6651af7b1360b5490515c496c6e1b6b2 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Thu, 1 Oct 2015 10:57:21 +0300
Subject: [PATCH] Fixing grenade_job

Grenade job fails on is_service_running check
because it waits for the stop of the wrong process

Change-Id: I3e06d987b3fd047f45b59fbadc41c3284fab90d5
Closes-bug: #1501775
---
 devstack/upgrade/shutdown.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 129f60a1..9f49f936 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/sahara
 
@@ -18,4 +19,4 @@ set -o xtrace
 stop_sahara
 
 # sanity check that service is actually down
-ensure_services_stopped sahara
+ensure_services_stopped sahara-all