Added patches init-scripts for kill services

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

diff --git a/rpm/SOURCES/neutron-openvswitch-agent.init b/rpm/SOURCES/neutron-openvswitch-agent.init
index 6aa5dc7f131a8bffb03c5a413bbd2cc12972e3ce..d7481affcf33fef2f055c2346e288eff9cdb198e 100644 (file)
--- a/rpm/SOURCES/neutron-openvswitch-agent.init
+++ b/rpm/SOURCES/neutron-openvswitch-agent.init
@@ -18,7 +18,6 @@ configs=(
     "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/ovs-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -30,7 +29,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -40,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