openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make rabbitmq container work with it's proper hostname set"

Browse Source
This commit is contained in:
Jenkins 2015-03-19 13:34:13 +00:00 committed by Gerrit Code Review
commit 3309f5e4a0
2 changed files with 5 additions and 1 deletions
docker/rabbitmq
Dockerfilestart.sh

2
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

4
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