prevent neutron-server init script for kill himself

[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..88c47be474d2c369a8e744b44ac4a512f8a7920f 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" \
 )
@@ -39,6 +40,16 @@ stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
     retval=$?
+    sleep 2
+    tailsss=$(ps axf | grep  $prog-server | grep 'bin/python' | awk '{print $1}')
+    itersss=100
+    while [ ! -z $tailsss ] && [ $itersss -gt 0 ] ; do
+      kill $tailsss
+      retval=$?
+      sleep 2
+      tailsss=$(ps axf | grep  $prog-server | grep 'bin/python' | awk '{print $1}')
+      itersss=$(($itersss-1))
+    done
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
     return $retval