summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-03-18 15:24:16 -0700
committerSteven Dake <stdake@cisco.com>2015-03-18 15:24:47 -0700
commitac930b33dd82075ff1b689ed233935add7dd7bda (patch)
treebc12d0a4ac48ecab35f01feaab93b6dcbaa44939 /docker
parent904c8db96e6816032ad262611dd096d06627f6fa (diff)
downloadkolla-ac930b33dd82075ff1b689ed233935add7dd7bda.tar.gz
kolla-ac930b33dd82075ff1b689ed233935add7dd7bda.zip
Make rabbitmq container work with it's proper hostname set
Change-Id: I0f79ba151dbb290378e2db0d1af9feb71cb84e6d
Diffstat (limited to 'docker')
-rw-r--r--docker/rabbitmq/Dockerfile2
-rwxr-xr-xdocker/rabbitmq/start.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 977cdd23a..e269e1f42 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -2,7 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages
-RUN yum -y install rabbitmq-server && yum clean all
+RUN yum -y install rabbitmq-server hostname && yum clean all
# Run the management plugin
RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh
index 6d90c410a..7ad7fbe75 100755
--- a/docker/rabbitmq/start.sh
+++ b/docker/rabbitmq/start.sh
@@ -17,4 +17,8 @@ sed -i '
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
+
exec /usr/sbin/rabbitmq-server