X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=blobdiff_plain;f=rpm%2FSOURCES%2Fneutron-server.init;h=d545b8180aeb8c2e4bc0c5ef4e19fd1b9856c894;hp=36d792a8def9aea8eea95e3eb88d9f167e2dfd3a;hb=423ca751f5d0d102af56e1601de9f9552b91a80e;hpb=2dd62a121c7d2565bd357d59e1e598a825abb966

diff --git a/rpm/SOURCES/neutron-server.init b/rpm/SOURCES/neutron-server.init
index 36d792a8d..d545b8180 100644
--- a/rpm/SOURCES/neutron-server.init
+++ b/rpm/SOURCES/neutron-server.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # neutron  OpenStack Software Defined Networking Service
 #
@@ -11,7 +11,11 @@
 
 prog=neutron
 exec="/usr/bin/$prog-server"
-config="/etc/$prog/$prog.conf"
+configs=(
+    "/usr/share/$prog/$prog-dist.conf" \
+    "/etc/$prog/$prog.conf" \
+    "/etc/$prog/plugin.ini" \
+)
 pidfile="/var/run/$prog/$prog.pid"
 logfile="/var/log/$prog/server.log"
 
@@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog-server
 
 start() {
     [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
+    for config in ${configs[@]}; do
+        [ -f $config ] || exit 6
+    done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --config-file $config --config-file /etc/$prog/plugin.ini --log-file $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec ${configs[@]/#/--config-file } --log-file $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -33,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