From 0e6854d22416a1178092527a15f079a115605144 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Thu, 25 Jun 2015 21:40:30 +0200
Subject: [PATCH] Do not run all vars through check_required_vars
Doing this breaks non-clustered setups and LOG_BASE isn't even set.
Change-Id: If4f5deb54c8bb6881af4e532e32d725a05f53f49
Closes-Bug: #1468882
---
docker/centos/binary/rabbitmq/config-rabbit.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker/centos/binary/rabbitmq/config-rabbit.sh b/docker/centos/binary/rabbitmq/config-rabbit.sh
index f78cd0656..2be0f5b9c 100644
--- a/docker/centos/binary/rabbitmq/config-rabbit.sh
+++ b/docker/centos/binary/rabbitmq/config-rabbit.sh
@@ -2,8 +2,7 @@
. /opt/kolla/kolla-common.sh
-check_required_vars RABBITMQ_CLUSTER_COOKIE RABBITMQ_CLUSTER_NODES \
- RABBITMQ_LOG_BASE RABBITMQ_PASS RABBITMQ_USER
+check_required_vars RABBITMQ_PASS RABBITMQ_USER
RABBITMQ_CLUSTER_CONFIGURATION=""
@@ -12,7 +11,7 @@ function configure_files {
sed -i '
s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g
s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g
- s|@RABBITMQ_CLUSTER_NODES@|'"$RABBITMQ_CLUSTER_CONFIGURATION"'|g
+ s|@RABBITMQ_CLUSTER_CONFIGURATION@|'"$RABBITMQ_CLUSTER_CONFIGURATION"'|g
' /etc/rabbitmq/rabbitmq.config
sed -i '
@@ -21,6 +20,8 @@ function configure_files {
}
function configure_cluster {
+ check_required_vars RABBITMQ_CLUSTER_COOKIE RABBITMQ_CLUSTER_NODES
+
echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
chown rabbitmq /var/lib/rabbitmq/.erlang.cookie
chmod 700 /var/lib/rabbitmq/.erlang.cookie
--
GitLab