x/powervc-driver
Code Issues Proposed changes

Update neutron start cmd per openstack neutron community code changed

Browse Source 
As community code changed a couple of days ago, neutron-powervc need
to apply with this change. Need to add
"--config-file /etc/neutron/neutron.json" to neutron service start
init cmd.

Change-Id: I9cb1d1e762258b644df83a68afdf7562ce5b55ae
Closes-Bug: #1432622
This commit is contained in:
Jerry Cai 2015-03-16 20:41:25 +08:00
parent 7777699e4a
commit 614cd07d15
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron-powervc/init/openstack-neutron-powervc
View File

@ -25,6 +25,7 @@ amqp_os_conf="/etc/powervc/amqp-openstack-neutron.conf"
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
pidfile="/var/run/$suffix/neutron-$suffix.pid"
logfile="/var/log/$suffix/neutron-$suffix.log"
neutronconf="/etc/neutron/neutron.conf"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@ -35,7 +36,7 @@ start() {
[ -f $config ] || exit 6
[ -f $powervcconf ] || exit 6
echo -n $"Starting $prog: "
daemon --user powervc --pidfile $pidfile "$exec --config-file $amqp_os_conf --config-file $amqp_pvc_conf --config-file $config --config-file $powervcconf --logfile $logfile &>/dev/null & echo \$! > $pidfile"
daemon --user powervc --pidfile $pidfile "$exec --config-file $neutronconf --config-file $amqp_os_conf --config-file $amqp_pvc_conf --config-file $config --config-file $powervcconf --logfile $logfile &>/dev/null & echo \$! > $pidfile"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile