diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 15:25:59 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 15:25:59 -0400 |
commit | 0909491c798c55d4e4fbd5e700fe43e99b076a58 (patch) | |
tree | a58afe30c85de8f35b72b43133090c8f27992f2b | |
parent | b944ef902f6091363a3e23cc0d1f6dc8308f639b (diff) | |
download | meta-cloud-services-0909491c798c55d4e4fbd5e700fe43e99b076a58.tar.gz |
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>
-rw-r--r-- | meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server | 2 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb | 2 |
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 @@ | |||
18 | 18 | ||
19 | # Ensure that HOME is set, since the erlang ookie file must be written | 19 | # Ensure that HOME is set, since the erlang ookie file must be written |
20 | # somewhere | 20 | # somewhere |
21 | export HOME=/root/ | 21 | export HOME=%ROOT_HOME% |
22 | 22 | ||
23 | DAEMON=/usr/bin/rabbitmq-server | 23 | DAEMON=/usr/bin/rabbitmq-server |
24 | CONTROL=/usr/bin/rabbitmqctl | 24 | 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() { | |||
39 | install -d ${D}${sysconfdir}/init.d | 39 | install -d ${D}${sysconfdir}/init.d |
40 | install -m 0755 ${WORKDIR}/rabbitmq-server ${D}${sysconfdir}/init.d/rabbitmq-server | 40 | install -m 0755 ${WORKDIR}/rabbitmq-server ${D}${sysconfdir}/init.d/rabbitmq-server |
41 | 41 | ||
42 | sed -e "s:%ROOT_HOME%:${ROOT_HOME}:" -i ${D}${sysconfdir}/init.d/rabbitmq-server | ||
43 | |||
42 | mv ${D}/ebin ${RABBIT_LIB_DIR}/ebin | 44 | mv ${D}/ebin ${RABBIT_LIB_DIR}/ebin |
43 | mv ${D}/include ${RABBIT_LIB_DIR}/include | 45 | mv ${D}/include ${RABBIT_LIB_DIR}/include |
44 | mv ${D}/plugins ${RABBIT_LIB_DIR}/plugins | 46 | mv ${D}/plugins ${RABBIT_LIB_DIR}/plugins |