]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Added patches init-scripts for kill services openstack-ci/fuel-5.0.2/2014.1.1
authorSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Mon, 30 Jun 2014 12:35:47 +0000 (16:35 +0400)
committerDmitry Burmistrov <dburmistrov@mirantis.com>
Mon, 18 Aug 2014 09:02:01 +0000 (13:02 +0400)
Related-Bug #1333292

Change-Id: I304242180ae77d29a7df4a878b254a5e757e24a8
(cherry picked from commit e066a587ff84e1fdea4400d92fe3aea2b17b91e4)

rpm/SOURCES/openstack-cinder-api.init
rpm/SOURCES/openstack-cinder-backup.init
rpm/SOURCES/openstack-cinder-scheduler.init
rpm/SOURCES/openstack-cinder-volume.init

index 1fb46a7b6b73829fc4925667ea16f781a11fe402..94a693837414a16757bb83989ea1b15440584bd1 100644 (file)
@@ -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
index ce999f6412babbfc8237e608a2147263148f5e0c..759c2da1fc20e313ab960d4ff883e796190f9e32 100644 (file)
@@ -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
index 8d1ba8febb944b5b5003071fd6dc6799bf0f6261..c7845d4f786621333e8be2f731a58fac3f339acc 100644 (file)
@@ -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
index 896c6b3983b6bf1a522045c3f0174684a049ef95..09ca77b21d84f9e8698c63b471e4c28f9b155ac3 100644 (file)
@@ -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