From 7b5bba81e957c4107c02f71b0d41b0a3f035385f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 18 Nov 2013 14:04:46 -0500 Subject: initscrtips: make initscripts chkconfig and service safe To support the execution of the chkconfig and service scripts, we need to ensure a consistent header on the initscripts, and a consistent environment that allows scratch files to be written. Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-ceilometer/ceilometer.init | 3 ++- meta-openstack/recipes-devtools/python/python-heat/heat.init | 3 ++- .../recipes-devtools/python/python-keystone/keystone | 7 ++++++- meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server | 4 ++++ meta-openstack/recipes-support/tgt/files/tgtd.init | 10 ++++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init index 13a51b9..c726855 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init @@ -4,7 +4,8 @@ # Provides: # Required-Start: $remote_fs $network $syslog # Required-Stop: $remote_fs $syslog -# Default-Stop: 0 1 6 +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 # Short-Description: Ceilometer Servers # Description: OpenStack Monitoring Service (code-named Ceilometer) server(s) ### END INIT INFO diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.init b/meta-openstack/recipes-devtools/python/python-heat/heat.init index 452691a..a7a168d 100644 --- a/meta-openstack/recipes-devtools/python/python-heat/heat.init +++ b/meta-openstack/recipes-devtools/python/python-heat/heat.init @@ -4,7 +4,8 @@ # Provides: # Required-Start: $remote_fs $network $syslog # Required-Stop: $remote_fs $syslog -# Default-Stop: 0 1 6 +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 # Short-Description: Heat Servers # Description: OpenStack Orchestration Service (code-named heat) ### END INIT INFO diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone b/meta-openstack/recipes-devtools/python/python-keystone/keystone index bdcfcc7..a5529df 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/keystone +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone @@ -2,7 +2,12 @@ ### BEGIN INIT INFO # Provides: keystone -# Short-Description: OpenStack Identity Service +# Required-Start: $remote_fs $network $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Keystone Server +# Description: OpenStack identity Service (code-named keystone) ### END INIT INFO DESC="keystone" diff --git a/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server b/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server index 38718ea..6f1d2d4 100644 --- a/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server +++ b/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server @@ -16,6 +16,10 @@ # Short-Description: Enable AMQP service provided by RabbitMQ broker ### END INIT INFO +# Ensure that HOME is set, since the erlang ookie file must be written +# somewhere +export HOME=${HOME:-/tmp} + DAEMON=/usr/bin/rabbitmq-server CONTROL=/usr/bin/rabbitmqctl USER=root diff --git a/meta-openstack/recipes-support/tgt/files/tgtd.init b/meta-openstack/recipes-support/tgt/files/tgtd.init index 656a243..3408645 100644 --- a/meta-openstack/recipes-support/tgt/files/tgtd.init +++ b/meta-openstack/recipes-support/tgt/files/tgtd.init @@ -1,5 +1,15 @@ #!/bin/sh +### BEGIN INIT INFO +# Provides: tgtd +# Required-Start: $remote_fs $network $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SCSI target daemon +# Description: Linux SCSI target framework (tgt) +### END INIT INFO + DESC="tgtd" DAEMON="/usr/sbin/tgtd" PIDFILE="/var/run/tgtd.pid" -- cgit v1.2.3-54-g00ecf