X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fopenstack-ceilometer-central.init;h=b39e6cf20bf8f2aa3d4c24128b3ea9abc8f4ec75;hb=refs%2Ftags%2Fopenstack-ci%2Ffuel%2F2014.1.1%2F5.1.1;hp=366d74a858e699f0fc27f72fba75e9932142dba2;hpb=3129af66a075f16a30b138c36b707fbed536f394;p=openstack-build%2Fceilometer-build.git

diff --git a/rpm/SOURCES/openstack-ceilometer-central.init b/rpm/SOURCES/openstack-ceilometer-central.init
index 366d74a..b39e6cf 100644
--- a/rpm/SOURCES/openstack-ceilometer-central.init
+++ b/rpm/SOURCES/openstack-ceilometer-central.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-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