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

Related-Bug #1333292

Change-Id: I304242180ae77d29a7df4a878b254a5e757e24a8
---
 rpm/SOURCES/openstack-cinder-api.init       | 5 +++++
 rpm/SOURCES/openstack-cinder-backup.init    | 5 +++++
 rpm/SOURCES/openstack-cinder-scheduler.init | 5 +++++
 rpm/SOURCES/openstack-cinder-volume.init    | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/rpm/SOURCES/openstack-cinder-api.init b/rpm/SOURCES/openstack-cinder-api.init
index 1fb46a7b6..94a693837 100644
--- a/rpm/SOURCES/openstack-cinder-api.init
+++ b/rpm/SOURCES/openstack-cinder-api.init
@@ -50,6 +50,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep cinder-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep cinder-$suffix &>/dev/null && \
+        killall cinder-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-backup.init b/rpm/SOURCES/openstack-cinder-backup.init
index ce999f641..759c2da1f 100644
--- a/rpm/SOURCES/openstack-cinder-backup.init
+++ b/rpm/SOURCES/openstack-cinder-backup.init
@@ -44,6 +44,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep cinder-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep cinder-$suffix &>/dev/null && \
+        killall cinder-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-scheduler.init b/rpm/SOURCES/openstack-cinder-scheduler.init
index 8d1ba8feb..c7845d4f7 100644
--- a/rpm/SOURCES/openstack-cinder-scheduler.init
+++ b/rpm/SOURCES/openstack-cinder-scheduler.init
@@ -42,6 +42,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep cinder-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep cinder-$suffix &>/dev/null && \
+        killall cinder-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-volume.init b/rpm/SOURCES/openstack-cinder-volume.init
index 896c6b398..09ca77b21 100644
--- a/rpm/SOURCES/openstack-cinder-volume.init
+++ b/rpm/SOURCES/openstack-cinder-volume.init
@@ -50,6 +50,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep cinder-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep cinder-$suffix &>/dev/null && \
+        killall cinder-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
-- 
2.45.2