Added patches to init-scripts for kill services

[openstack-build/ceilometer-build.git] / rpm / SOURCES / openstack-ceilometer-compute.init

diff --git a/rpm/SOURCES/openstack-ceilometer-compute.init b/rpm/SOURCES/openstack-ceilometer-compute.init
index 25e578a26f6d14e7658ccf3ae7a7915fa15f96c5..f5877b9cb5ca798242f0aacf16d419746eede565 100644 (file)
--- a/rpm/SOURCES/openstack-ceilometer-compute.init
+++ b/rpm/SOURCES/openstack-ceilometer-compute.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -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