Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove ryu plugin from packages
[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 36d792a8def9aea8eea95e3eb88d9f167e2dfd3a..d5ccc9f0a51783296b08c26db105b34a386cc540 100644
(file)
--- a/
rpm/SOURCES/neutron-server.init
+++ b/
rpm/SOURCES/neutron-server.init
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
#
# neutron OpenStack Software Defined Networking Service
#
#
# neutron OpenStack Software Defined Networking Service
#
@@
-11,7
+11,11
@@
prog=neutron
exec="/usr/bin/$prog-server"
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"
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
start() {
[ -x $exec ] || exit 5
- [ -f $config ] || exit 6
+ for config in ${configs[@]}; do
+ [ -f $config ] || exit 6
+ done
echo -n $"Starting $prog: "
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
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile