From 687ce6d4e277aeeaa8341c9636de1e4d19ca2d1d Mon Sep 17 00:00:00 2001 From: Jerry Cai Date: Mon, 16 Mar 2015 20:41:25 +0800 Subject: [PATCH] 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 --- neutron-powervc/init/openstack-neutron-powervc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron-powervc/init/openstack-neutron-powervc b/neutron-powervc/init/openstack-neutron-powervc index 5a3ab2a..d4202fc 100644 --- a/neutron-powervc/init/openstack-neutron-powervc +++ b/neutron-powervc/init/openstack-neutron-powervc @@ -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