openstack/kolla-ansible
Code Issues Proposed changes

Implements: blueprint update-rabbit-container

Browse Source 
Previously, the rabbit container was configured for use in
a k8s cluster. This patch updates the container to run with fig
instead of k8s.

Change-Id: Ie04f2f16771c0f733b7b09b7747325bf0d7fb1a9
This commit is contained in:
Daneyon Hansen 2015-02-19 01:27:29 +00:00
parent 9d72d99f86
commit 8a2a8c8a8a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/rabbitmq/Dockerfile
View File

@ -1,8 +1,18 @@
FROM kollaglue/fedora-rdo-base FROM kollaglue/fedora-rdo-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install rabbitmq-server; yum clean all # Install required packages
RUN yum -y install rabbitmq-server && yum clean all
# Run the management plugin
RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
# Copy Rabbit conf files
ADD rabbitmq.config /etc/rabbitmq/ ADD rabbitmq.config /etc/rabbitmq/
ADD rabbitmq-env.conf /etc/rabbitmq/ ADD rabbitmq-env.conf /etc/rabbitmq/
# Copy start-up script
ADD start.sh /start.sh ADD start.sh /start.sh
# Start Rabbit through the start script
CMD ["/start.sh"] CMD ["/start.sh"]

3
docker/rabbitmq/rabbitmq-env.conf
View File

@ -1,3 +1,2 @@
RABBITMQ_NODE_PORT=@RABBITMQ_PORT@ RABBITMQ_NODENAME=@RABBITMQ_NODENAME@
RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@ RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@

7
docker/rabbitmq/start.sh
View File

@ -4,7 +4,7 @@ set -e
: ${RABBITMQ_USER:=guest} : ${RABBITMQ_USER:=guest}
: ${RABBITMQ_PASS:=guest} : ${RABBITMQ_PASS:=guest}
: ${RABBITMQ_NODE_PORT:=5672} : ${RABBITMQ_NODENAME:=rabbit}
: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq} : ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
sed -i ' sed -i '
@ -13,9 +13,8 @@ sed -i '
' /etc/rabbitmq/rabbitmq.config ' /etc/rabbitmq/rabbitmq.config
sed -i ' sed -i '
s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g s|@RABBITMQ_NODENAME@|'"$RABBITMQ_NODENAME"'|g
s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
' /etc/rabbitmq/rabbitmq-env.conf ' /etc/rabbitmq/rabbitmq-env.conf
exec /usr/lib/rabbitmq/bin/rabbitmq-server exec /usr/sbin/rabbitmq-server