aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack
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 15:18:14 -0400
commit0068edf3af7f31e98db91d9f6db693af8f3bcb9b (patch)
tree0e3dd6f0332a40b84e60a408bfeb5588b1c21561 /meta-openstack
parenteff254762070ec2cac69e8dcb5ca87a744ef649a (diff)
downloadmeta-cloud-services-0068edf3af7f31e98db91d9f6db693af8f3bcb9b.tar.gz
meta-cloud-services-0068edf3af7f31e98db91d9f6db693af8f3bcb9b.tar.bz2
meta-cloud-services-0068edf3af7f31e98db91d9f6db693af8f3bcb9b.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')
-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 b65feef4..4a32990e 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 5f080e3d..101d098f 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