From 06f2fd72cd97219853a670db85275cfc7474f7a6 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Thu, 15 Oct 2015 14:38:13 +0200
Subject: [PATCH] Fix grenade shutdown script

Due to some fix in devstack, using the old lib/heat library doesn't work
anymore, so let's replicate the stop_heat function.

Change-Id: I8e7c62962cef29e35c37ad98a1646630388fb4ab
Closes-Bug: #1506462
---
 devstack/upgrade/shutdown.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 7e2f9ebb49..55ceed338c 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -20,12 +20,12 @@ 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/heat
 
 set -o xtrace
 
-stop_heat
+for serv in h-eng h-api h-api-cfn h-api-cw; do
+    stop_process $serv
+done
 
 SERVICES_DOWN="heat-api heat-engine heat-api-cfn heat-api-cloudwatch"