Added patches init-scripts for kill services

Related-Bug #1333292

Change-Id: Ida731c6cf7a72c84977461df99a461c55564826b
(cherry picked from commit fc1c16f2c9dbc5c5f9c05dfe1c8d8127625d4650)

diff --git a/rpm/SOURCES/openstack-heat-api-cfn.init b/rpm/SOURCES/openstack-heat-api-cfn.init
index acdf1c5e5a5185dcaca837716ece8137af422491..4fe9c6968062ac3bfe8a899a47149ce8bac0d5dc 100644 (file)
--- 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 fd8f77032ce0b87554cd494f15d1346eb49a8e3a..c8f33b0d6fd1ceaa831b8e40222812e95a5ca076 100644 (file)
--- 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 bfed9953f116c5162a05a68fbf4ca812abe85a36..60869d4fd1119225838975d2d0cf5d5e8df129bd 100644 (file)
--- 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 573937cfe9b2d8ff1641b7c59fd7268ccc523bb7..12b8b5c93f13263b002903f67e0bb1caf94a6b56 100644 (file)
--- 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