aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-31 17:29:13 +0000
committerGerrit Code Review <review@openstack.org>2016-08-31 17:29:13 +0000
commit7b8e851e979f8ef4321b78d3944944143d3f5d3d (patch)
tree472c0e5173b16758b10a8dde5494b19d17ab9398
parente37314aaabd8610dfe44df05791c7b026c319442 (diff)
parente4f3e34e5d024ccabf17a1232581433f5e5d19c5 (diff)
downloadkolla-7b8e851e979f8ef4321b78d3944944143d3f5d3d.tar.gz
kolla-7b8e851e979f8ef4321b78d3944944143d3f5d3d.zip
Merge "Allow operators to customise rabbitmq plugins"
-rw-r--r--docker/rabbitmq/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 5364c7c2b..a0b1fe49d 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -28,6 +28,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
+{% block rabbitmq_install_plugins %}
# NOTE(sdake): the /bin/true unblocks the rabbitmq-plugins tool. Not sure how
# or why. My suspicion is it sends a signal to the parent
# process.
@@ -37,6 +38,7 @@ RUN rm -rf /var/lib/rabbitmq/* \
rabbitmq_management \
rabbitmq_clusterer \
&& /bin/true
+{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY rabbitmq_sudoers /etc/sudoers.d/kolla_rabbitmq_sudoers