Update neutron start cmd per openstack neutron community code changed
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:
parent
3141f56b12
commit
687ce6d4e2
|
@ -25,6 +25,7 @@ amqp_os_conf="/etc/powervc/amqp-openstack-neutron.conf"
|
||||||
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
|
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
|
||||||
pidfile="/var/run/$suffix/neutron-$suffix.pid"
|
pidfile="/var/run/$suffix/neutron-$suffix.pid"
|
||||||
logfile="/var/log/$suffix/neutron-$suffix.log"
|
logfile="/var/log/$suffix/neutron-$suffix.log"
|
||||||
|
neutronconf="/etc/neutron/neutron.conf"
|
||||||
|
|
||||||
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
||||||
|
|
||||||
|
@ -35,7 +36,7 @@ start() {
|
||||||
[ -f $config ] || exit 6
|
[ -f $config ] || exit 6
|
||||||
[ -f $powervcconf ] || exit 6
|
[ -f $powervcconf ] || exit 6
|
||||||
echo -n $"Starting $prog: "
|
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=$?
|
retval=$?
|
||||||
echo
|
echo
|
||||||
[ $retval -eq 0 ] && touch $lockfile
|
[ $retval -eq 0 ] && touch $lockfile
|
||||||
|
|
Loading…
Reference in New Issue