diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 15:25:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 15:25:11 +0000 |
| commit | c2abefff544d0666cc349e8cdf279806ee835ea5 (patch) | |
| tree | a8ee103ea3b0222e42ad414ede14415fdd664865 /docker | |
| parent | 7c6b74100d269218230506da84b7f9af432deb17 (diff) | |
| parent | b6713a821371c3549fba524d4c1136314cfa8ae5 (diff) | |
| download | kolla-c2abefff544d0666cc349e8cdf279806ee835ea5.tar.gz kolla-c2abefff544d0666cc349e8cdf279806ee835ea5.zip | |
Merge "Add rabbitmq_install block to RabbitMQ Dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 26edd5ebe..764ffbab2 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -7,6 +7,7 @@ MAINTAINER {{ maintainer }} {{ macros.configure_user(name='rabbitmq') }} +{% block rabbitmq_install %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set rabbitmq_packages = [ 'hostname', @@ -34,6 +35,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} {% endif %} +{% endblock %} {% block rabbitmq_install_plugins %} |