diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-02-19 01:27:29 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-02-19 01:33:59 +0000 |
| commit | 8a2a8c8a8a44ae2f393a7278d21ff47a5cec9add (patch) | |
| tree | a44eb378d6a64cf610ed6fa8ee9b337e1cad32ea /docker | |
| parent | 9d72d99f86b300bedd188aa2c6db6daed0201ec2 (diff) | |
| download | kolla-8a2a8c8a8a44ae2f393a7278d21ff47a5cec9add.tar.gz kolla-8a2a8c8a8a44ae2f393a7278d21ff47a5cec9add.zip | |
Implements: blueprint update-rabbit-container
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/rabbitmq/rabbitmq-env.conf | 3 | ||||
| -rwxr-xr-x | docker/rabbitmq/start.sh | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index 57ad486ea..a4389598a 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -1,8 +1,18 @@ FROM kollaglue/fedora-rdo-base 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-env.conf /etc/rabbitmq/ + +# Copy start-up script ADD start.sh /start.sh + +# Start Rabbit through the start script CMD ["/start.sh"] diff --git a/docker/rabbitmq/rabbitmq-env.conf b/docker/rabbitmq/rabbitmq-env.conf index c2b843e5e..e76f18f0b 100644 --- a/docker/rabbitmq/rabbitmq-env.conf +++ b/docker/rabbitmq/rabbitmq-env.conf @@ -1,3 +1,2 @@ -RABBITMQ_NODE_PORT=@RABBITMQ_PORT@ +RABBITMQ_NODENAME=@RABBITMQ_NODENAME@ RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@ - diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh index d50636424..6d90c410a 100755 --- a/docker/rabbitmq/start.sh +++ b/docker/rabbitmq/start.sh @@ -4,7 +4,7 @@ set -e : ${RABBITMQ_USER:=guest} : ${RABBITMQ_PASS:=guest} -: ${RABBITMQ_NODE_PORT:=5672} +: ${RABBITMQ_NODENAME:=rabbit} : ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq} sed -i ' @@ -13,9 +13,8 @@ sed -i ' ' /etc/rabbitmq/rabbitmq.config sed -i ' - s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g + s|@RABBITMQ_NODENAME@|'"$RABBITMQ_NODENAME"'|g s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g ' /etc/rabbitmq/rabbitmq-env.conf -exec /usr/lib/rabbitmq/bin/rabbitmq-server - +exec /usr/sbin/rabbitmq-server |