2 files changed, 3 insertions, 3 deletions

diff --git a/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server b/meta-openstack/recipes-extended/rabbitmq/files/rabbitmq-server
index 6f1d2d4..5e51adf 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=${HOME:-/tmp}
+export HOME=/var/lib/rabbitmq/
 
 DAEMON=/usr/bin/rabbitmq-server
 CONTROL=/usr/bin/rabbitmqctl
diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.0.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.0.4.bb
index 424459f..ff5db09 100644
--- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.0.4.bb
+++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.0.4.bb
@@ -45,8 +45,8 @@ inherit useradd update-rc.d
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system rabbitmq"
-USERADD_PARAM_${PN}  = "--system --home /var/lib/rabbitmq -g rabbitmq \
-                        --no-create-home rabbitmq"
+USERADD_PARAM_${PN}  = "--system --create-home --home /var/lib/rabbitmq \
+                        -g rabbitmq rabbitmq"
 
 INITSCRIPT_NAME = "rabbitmq-server"
 INITSCRIPT_PARAMS = "defaults"