diff options
Diffstat (limited to 'docker/common')
| -rw-r--r-- | docker/common/rabbitmq/rabbitmq-env.conf | 2 | ||||
| -rw-r--r-- | docker/common/rabbitmq/rabbitmq.config | 1 | ||||
| -rwxr-xr-x | docker/common/rabbitmq/start.sh | 21 |
3 files changed, 4 insertions, 20 deletions
diff --git a/docker/common/rabbitmq/rabbitmq-env.conf b/docker/common/rabbitmq/rabbitmq-env.conf index e76f18f0b..a8926619c 100644 --- a/docker/common/rabbitmq/rabbitmq-env.conf +++ b/docker/common/rabbitmq/rabbitmq-env.conf @@ -1,2 +1,2 @@ -RABBITMQ_NODENAME=@RABBITMQ_NODENAME@ +RABBITMQ_NODENAME=rabbit RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@ diff --git a/docker/common/rabbitmq/rabbitmq.config b/docker/common/rabbitmq/rabbitmq.config index 15a47eba1..7cd0f6829 100644 --- a/docker/common/rabbitmq/rabbitmq.config +++ b/docker/common/rabbitmq/rabbitmq.config @@ -1,5 +1,6 @@ [ {rabbit, [ + @RABBITMQ_CLUSTER_CONFIGURATION@ {default_user, <<"@RABBITMQ_USER@">>}, {default_pass, <<"@RABBITMQ_PASS@">>} ]}, diff --git a/docker/common/rabbitmq/start.sh b/docker/common/rabbitmq/start.sh index f70c34866..4e76e382f 100755 --- a/docker/common/rabbitmq/start.sh +++ b/docker/common/rabbitmq/start.sh @@ -1,24 +1,7 @@ #!/bin/bash -set -e +. /opt/kolla/config-rabbit.sh -: ${RABBITMQ_USER:=guest} -: ${RABBITMQ_PASS:=guest} -: ${RABBITMQ_NODENAME:=rabbit} -: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq} - -sed -i ' - s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g - s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g -' /etc/rabbitmq/rabbitmq.config - -sed -i ' - s|@RABBITMQ_NODENAME@|'"$RABBITMQ_NODENAME"'|g - s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g -' /etc/rabbitmq/rabbitmq-env.conf - -# work around: -# https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/653405 -echo "${RABBITMQ_SERVICE_HOST} `/usr/bin/hostname -s`" > /etc/hosts +configure_rabbit exec /usr/sbin/rabbitmq-server |