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-metadata-agent.init
diff --git
a/rpm/SOURCES/neutron-metadata-agent.init
b/rpm/SOURCES/neutron-metadata-agent.init
index 0555fe862f535a6ae0731ae5ac42296abc5ced60..4a0384dea79dcddcea69f3ba6c1d041e1abffb9c 100644
(file)
--- a/
rpm/SOURCES/neutron-metadata-agent.init
+++ b/
rpm/SOURCES/neutron-metadata-agent.init
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
#
# neutron-metadata-agent OpenStack Neutron Metadata Agent
#
#
# neutron-metadata-agent OpenStack Neutron Metadata Agent
#
@@
-12,7
+12,11
@@
proj=neutron
plugin=metadata-agent
prog=$proj-$plugin
exec="/usr/bin/$prog"
plugin=metadata-agent
prog=$proj-$plugin
exec="/usr/bin/$prog"
-config="/etc/$proj/metadata_agent.ini"
+configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
+ "/etc/$proj/$proj.conf" \
+ "/etc/$proj/metadata_agent.ini" \
+)
pidfile="/var/run/$proj/$prog.pid"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
pidfile="/var/run/$proj/$prog.pid"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@
-21,9
+25,11
@@
lockfile=/var/lock/subsys/$prog
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 --log-file /var/log/$proj/$plugin.log
--config-file /etc/$proj/$proj.conf --config-file $config
&>/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
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile