From: Sergey Otpuschennikov <sotpuschennikov@mirantis.com>
Date: Mon, 30 Jun 2014 14:47:23 +0000 (+0400)
Subject: Added patches to init-scripts for kill services
X-Git-Tag: openstack-ci/fuel/2014.1.1/5.1.1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Ftags%2Fopenstack-ci%2Ffuel%2F2014.1.1%2F5.1.1;p=openstack-build%2Fceilometer-build.git

Added patches to init-scripts for kill services

Related-Bug #1333292

Change-Id: I24e774b29b55971369c31680d863d89a1b584e6b
---

diff --git a/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init b/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init
index 265576e..feecf21 100644
--- a/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init
+++ b/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init b/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init
index 424e6ac..b793042 100644
--- a/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init
+++ b/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-api.init b/rpm/SOURCES/openstack-ceilometer-api.init
index 731c64c..ad5d726 100644
--- a/rpm/SOURCES/openstack-ceilometer-api.init
+++ b/rpm/SOURCES/openstack-ceilometer-api.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-central.init b/rpm/SOURCES/openstack-ceilometer-central.init
index 5d4d1ab..b39e6cf 100644
--- a/rpm/SOURCES/openstack-ceilometer-central.init
+++ b/rpm/SOURCES/openstack-ceilometer-central.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-agent-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-agent-$suffix &>/dev/null && \
+        killall ceilometer-agent-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-collector.init b/rpm/SOURCES/openstack-ceilometer-collector.init
index 8f798b9..a42e325 100644
--- a/rpm/SOURCES/openstack-ceilometer-collector.init
+++ b/rpm/SOURCES/openstack-ceilometer-collector.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-compute.init b/rpm/SOURCES/openstack-ceilometer-compute.init
index 6facfb0..f5877b9 100644
--- a/rpm/SOURCES/openstack-ceilometer-compute.init
+++ b/rpm/SOURCES/openstack-ceilometer-compute.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/rpm/SOURCES/openstack-ceilometer-notification.init b/rpm/SOURCES/openstack-ceilometer-notification.init
index 2695eca..cc25753 100644
--- a/rpm/SOURCES/openstack-ceilometer-notification.init
+++ b/rpm/SOURCES/openstack-ceilometer-notification.init
@@ -41,6 +41,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep ceilometer-$suffix &>/dev/null ; then
+        sleep 2
+        pgrep ceilometer-$suffix &>/dev/null && \
+        killall ceilometer-$suffix
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile