Added patches init-scripts for kill services

[openstack-build/neutron-build.git] / rpm / SOURCES / neutron-server.init

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