X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fneutron-metering-agent.init;h=22ae1aa98146c2644b2a43ba739dbd44313c4ee3;hb=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.0.2%2F2014.1.1;hp=798babaf4cc992b5fb48b0714db8940d969ddb27;hpb=230e607edf3ad1725b80f9ec05d8b661f96c4b10;p=openstack-build%2Fneutron-build.git

diff --git a/rpm/SOURCES/neutron-metering-agent.init b/rpm/SOURCES/neutron-metering-agent.init
index 798babaf4..22ae1aa98 100644
--- a/rpm/SOURCES/neutron-metering-agent.init
+++ b/rpm/SOURCES/neutron-metering-agent.init
@@ -13,6 +13,7 @@ plugin=metering-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
+    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/metering_agent.ini" \
 )
@@ -38,6 +39,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep $prog &>/dev/null ; then
+        sleep 2
+        pgrep $prog &>/dev/null && \
+        killall $prog
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile