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 265576ead9dbe637895554bdcdb7dee5bac7d6e5..feecf2158ce244ad314bd2a6aca8bce18c000f4a 100644 (file)
--- 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 424e6acd6fd9b63564e78ea8a59551668355d5a1..b7930429f4daf2ced77e7b19d1753d2bc58363bd 100644 (file)
--- 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 731c64cc4bde36710a765d7dd45df922761c442f..ad5d7265e61e75131aea7e16af53b442a583dacb 100644 (file)
--- 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 5d4d1ab8c55f9170f848e559ea6c93f7a799654e..b39e6cf20bf8f2aa3d4c24128b3ea9abc8f4ec75 100644 (file)
--- 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 8f798b9d9d2d11af3b6f9fb7fc9764736fbd27fe..a42e3258b3c4f188311bbc6e52522052f23a67ee 100644 (file)
--- 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 6facfb01aee23e67d699a2034b9db4417f094614..f5877b9cb5ca798242f0aacf16d419746eede565 100644 (file)
--- 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 2695eca62f5e94946e1cf4b01e2b7912bedff753..cc2575305ed540c86daa49768ff521165cf9bc7f 100644 (file)
--- 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