From fc1c16f2c9dbc5c5f9c05dfe1c8d8127625d4650 Mon Sep 17 00:00:00 2001
From: Sergey Otpuschennikov <sotpuschennikov@mirantis.com>
Date: Mon, 30 Jun 2014 16:50:20 +0400
Subject: [PATCH] Added patches init-scripts for kill services

Related-Bug #1333292

Change-Id: Ida731c6cf7a72c84977461df99a461c55564826b
---
 rpm/SOURCES/openstack-heat-api-cfn.init        | 5 +++++
 rpm/SOURCES/openstack-heat-api-cloudwatch.init | 5 +++++
 rpm/SOURCES/openstack-heat-api.init            | 5 +++++
 rpm/SOURCES/openstack-heat-engine.init         | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/rpm/SOURCES/openstack-heat-api-cfn.init b/rpm/SOURCES/openstack-heat-api-cfn.init
index acdf1c5e..4fe9c696 100644
--- a/rpm/SOURCES/openstack-heat-api-cfn.init
+++ b/rpm/SOURCES/openstack-heat-api-cfn.init
@@ -43,6 +43,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep heat-api-cfn &>/dev/null ; then
+        sleep 2
+        pgrep heat-api-cfn &>/dev/null && \
+        killall heat-api-cfn
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-heat-api-cloudwatch.init b/rpm/SOURCES/openstack-heat-api-cloudwatch.init
index fd8f7703..c8f33b0d 100644
--- a/rpm/SOURCES/openstack-heat-api-cloudwatch.init
+++ b/rpm/SOURCES/openstack-heat-api-cloudwatch.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep heat-api-cloudwatch &>/dev/null ; then
+        sleep 2
+        pgrep heat-api-cloudwatch &>/dev/null && \
+        killall heat-api-cloudwatch
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-heat-api.init b/rpm/SOURCES/openstack-heat-api.init
index bfed9953..60869d4f 100644
--- a/rpm/SOURCES/openstack-heat-api.init
+++ b/rpm/SOURCES/openstack-heat-api.init
@@ -43,6 +43,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep heat-api &>/dev/null ; then
+        sleep 2
+        pgrep heat-api &>/dev/null && \
+        killall heat-api
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-heat-engine.init b/rpm/SOURCES/openstack-heat-engine.init
index 573937cf..12b8b5c9 100644
--- a/rpm/SOURCES/openstack-heat-engine.init
+++ b/rpm/SOURCES/openstack-heat-engine.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep heat-engine &>/dev/null ; then
+        sleep 2
+        pgrep heat-engine &>/dev/null && \
+        killall heat-engine
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
-- 
2.45.2