x/powervc-driver
Code Issues Proposed changes

Upstart process daemon scripts need to change.

Browse Source 
To adapt to new configuration files.

Check blueprint new-configuration-strategy-needed-to-adapt-to-oslo-messaging

Closes-Bug: 1370337
Change-Id: Ic8e624206490680de07827613d4474bac62686a9
(cherry picked from commit ba29f897db75fc17b4a8b3fa049fe56ac8777678)
This commit is contained in:
Le Tian Ren 2014-09-17 13:47:19 +08:00
parent 5e0cd86117
commit 175cd1810d
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder-powervc/init/openstack-cinder-powervc
View File

@ -21,6 +21,8 @@ prog=openstack-cinder-powervc
exec="/opt/ibm/openstack/powervc-driver/bin/cinder-$suffix" exec="/opt/ibm/openstack/powervc-driver/bin/cinder-$suffix"
config="/etc/powervc/powervc.conf" config="/etc/powervc/powervc.conf"
cinderconf="/etc/cinder/cinder.conf" cinderconf="/etc/cinder/cinder.conf"
amqp_os_conf="/etc/powervc/amqp-openstack.conf"
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
pidfile="/var/run/$suffix/cinder-$suffix.pid" pidfile="/var/run/$suffix/cinder-$suffix.pid"
logfile="/var/log/$suffix/cinder-$suffix.log" logfile="/var/log/$suffix/cinder-$suffix.log"
@ -32,7 +34,7 @@ start() {
[ -x $exec ] || exit 5 [ -x $exec ] || exit 5
[ -f $config ] || exit 6 [ -f $config ] || exit 6
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon --user powervc --pidfile $pidfile "$exec --config-file $config --config-file $cinderconf --logfile $logfile &>/dev/null & echo \$! > $pidfile" daemon --user powervc --pidfile $pidfile "$exec --config-file $amqp_os_conf --config-file $amqp_pvc_conf --config-file $config --config-file $cinderconf --logfile $logfile &>/dev/null & echo \$! > $pidfile"
retval=$? retval=$?
echo echo
[ $retval -eq 0 ] && touch $lockfile [ $retval -eq 0 ] && touch $lockfile

4
glance-powervc/init/openstack-glance-powervc
View File

@ -20,6 +20,8 @@ suffix=powervc
prog=openstack-glance-powervc prog=openstack-glance-powervc
exec="/opt/ibm/openstack/powervc-driver/bin/glance-$suffix" exec="/opt/ibm/openstack/powervc-driver/bin/glance-$suffix"
config="/etc/powervc/powervc.conf" config="/etc/powervc/powervc.conf"
amqp_os_conf="/etc/powervc/amqp-openstack.conf"
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
pidfile="/var/run/$suffix/glance-$suffix.pid" pidfile="/var/run/$suffix/glance-$suffix.pid"
logfile="/var/log/$suffix/glance-$suffix.log" logfile="/var/log/$suffix/glance-$suffix.log"
@ -31,7 +33,7 @@ start() {
[ -x $exec ] || exit 5 [ -x $exec ] || exit 5
[ -f $config ] || exit 6 [ -f $config ] || exit 6
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon --user powervc --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" daemon --user powervc --pidfile $pidfile "$exec --config-file $amqp_os_conf --config-file $amqp_pvc_conf --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
retval=$? retval=$?
echo echo
[ $retval -eq 0 ] && touch $lockfile [ $retval -eq 0 ] && touch $lockfile

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

@ -21,6 +21,8 @@ prog=openstack-neutron-powervc
exec="/opt/ibm/openstack/powervc-driver/bin/neutron-$suffix-agent" exec="/opt/ibm/openstack/powervc-driver/bin/neutron-$suffix-agent"
config="/etc/$suffix/$suffix-neutron.conf" config="/etc/$suffix/$suffix-neutron.conf"
powervcconf="/etc/$suffix/$suffix.conf" powervcconf="/etc/$suffix/$suffix.conf"
amqp_os_conf="/etc/powervc/amqp-openstack-neutron.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"
@ -33,7 +35,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 $config --config-file $powervcconf --logfile $logfile &>/dev/null & echo \$! > $pidfile" 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"
retval=$? retval=$?
echo echo
[ $retval -eq 0 ] && touch $lockfile [ $retval -eq 0 ] && touch $lockfile

4
nova-powervc/init/openstack-nova-powervc
View File

@ -21,6 +21,8 @@ prog=openstack-nova-powervc
exec="/opt/ibm/openstack/powervc-driver/bin/nova-$suffix" exec="/opt/ibm/openstack/powervc-driver/bin/nova-$suffix"
config="/etc/$suffix/$suffix.conf" config="/etc/$suffix/$suffix.conf"
novaconf="/etc/nova/nova.conf" novaconf="/etc/nova/nova.conf"
amqp_os_conf="/etc/powervc/amqp-openstack.conf"
amqp_pvc_conf="/etc/powervc/amqp-powervc.conf"
pidfile="/var/run/$suffix/nova-$suffix.pid" pidfile="/var/run/$suffix/nova-$suffix.pid"
logfile="/var/log/$suffix/nova-$suffix.log" logfile="/var/log/$suffix/nova-$suffix.log"
@ -32,7 +34,7 @@ start() {
[ -x $exec ] || exit 5 [ -x $exec ] || exit 5
[ -f $config ] || exit 6 [ -f $config ] || exit 6
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon --user powervc --pidfile $pidfile "$exec --config-file $config --config-file $novaconf --logfile $logfile &>/dev/null & echo \$! > $pidfile" daemon --user powervc --pidfile $pidfile "$exec --config-file $amqp_os_conf --config-file $amqp_pvc_conf --config-file $config --config-file $novaconf --logfile $logfile &>/dev/null & echo \$! > $pidfile"
retval=$? retval=$?
echo echo
[ $retval -eq 0 ] && touch $lockfile [ $retval -eq 0 ] && touch $lockfile