aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-extended
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-07-18 15:25:59 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-31 12:56:50 -0400
commit22b50cd5240c768021a097bb935897f4db080dd5 (patch)
tree96a965bfe8db6fd06a851ee1aae88ca437ead9ae /meta-openstack/recipes-extended
parent8bf196453ab334051a986eba1a517d08e4e42c17 (diff)
downloadmeta-cloud-services-22b50cd5240c768021a097bb935897f4db080dd5.tar.gz
meta-cloud-services-22b50cd5240c768021a097bb935897f4db080dd5.tar.bz2
meta-cloud-services-22b50cd5240c768021a097bb935897f4db080dd5.zip
rabbitmq: make HOME configurable
Since rabbitmq uses HOME as the location for the erlang cookie, rabbitmq will fail to start if that directory is not on the system. To ensure that this is configurable, we use the bitbake variable ROOT_HOME and replace a placeholder in the initscript. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-extended')
-rw-r--r--meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server2
-rw-r--r--meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server b/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server
index b65feef..4a32990 100644
--- a/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server
+++ b/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server
@@ -18,7 +18,7 @@
# Ensure that HOME is set, since the erlang ookie file must be written
# somewhere
-export HOME=/root/
+export HOME=%ROOT_HOME%
DAEMON=/usr/bin/rabbitmq-server
CONTROL=/usr/bin/rabbitmqctl
diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
index 5f080e3..101d098 100644
--- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
+++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
@@ -39,6 +39,8 @@ do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/rabbitmq-server ${D}${sysconfdir}/init.d/rabbitmq-server
+ sed -e "s:%ROOT_HOME%:${ROOT_HOME}:" -i ${D}${sysconfdir}/init.d/rabbitmq-server
+
mv ${D}/ebin ${RABBIT_LIB_DIR}/ebin
mv ${D}/include ${RABBIT_LIB_DIR}/include
mv ${D}/plugins ${RABBIT_LIB_DIR}/plugins