diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-19 13:34:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-19 13:34:13 +0000 |
| commit | 3309f5e4a0c0c7e8e7a696e78c9ff78791d235f7 (patch) | |
| tree | a29fb7575b798b794499846b11b935bfd5d64a0d /docker | |
| parent | 97d3792bfec12d2aef350b1eafd9a05971e35e54 (diff) | |
| parent | ac930b33dd82075ff1b689ed233935add7dd7bda (diff) | |
| download | kolla-3309f5e4a0c0c7e8e7a696e78c9ff78791d235f7.tar.gz kolla-3309f5e4a0c0c7e8e7a696e78c9ff78791d235f7.zip | |
Merge "Make rabbitmq container work with it's proper hostname set"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/rabbitmq/start.sh | 4 |
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 |