diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 22:54:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 22:54:02 +0000 |
| commit | bcb89677da4a385da0c9decbcd578a45d79d52eb (patch) | |
| tree | 4ff5df990220b37d798db68564ada05c130e3926 /docker | |
| parent | 070a12444f4ec5dca33f4a6e6a303f9bc8da5197 (diff) | |
| parent | bc7cb520500f2e33a5df9afd32512fd3eb341def (diff) | |
| download | kolla-bcb89677da4a385da0c9decbcd578a45d79d52eb.tar.gz kolla-bcb89677da4a385da0c9decbcd578a45d79d52eb.zip | |
Merge "Rabbitmq: refactor Dockerfile.j2 file"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c723cc940..e5bcb6223 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -14,8 +14,6 @@ MAINTAINER {{ maintainer }} 'rabbitmq-server' ] %} -{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} - {% elif base_distro == 'ubuntu' %} {% set rabbitmq_packages = [ 'erlang-nox', @@ -24,17 +22,16 @@ MAINTAINER {{ maintainer }} 'socat' ] %} -{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} - {% elif base_distro == 'debian' %} {% set rabbitmq_packages = [ 'erlang-nox', 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb' ] %} +{% endif %} + {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} -{% endif %} {% endblock %} {% block rabbitmq_install_plugins %} |