summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Schlueter <jschluet@redhat.com>2019-01-31 21:13:50 -0500
committerMartin André <m.andre@redhat.com>2019-02-01 10:49:31 +0100
commitcfbcf830f04604b3628e999acc78a45dcebd27c2 (patch)
tree6b42e0716a293e4cf1f6fa34a965bd15f2c06733
parent08bff2ed5a1bbe0dd5db66971283b61a851d93a2 (diff)
Pin rabbitmq-server to 3.7.10
New version of rabbitmq-server in epel but not new enough version of erlang available in epel or delorean-trunk repos. Closes-Bug: #1814233 Change-Id: Iac3cad17ff8279a2be66ffe1366d6844f999d66f
Notes
Notes (review): Code-Review+2: Martin André <m.andre@redhat.com> Review-Priority+2: Martin André <m.andre@redhat.com> Code-Review+2: Mark Goddard <mark@stackhpc.com> Workflow+1: Mark Goddard <mark@stackhpc.com> Code-Review+1: Michal Nasiadka <michal.nasiadka@nokia.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 01 Feb 2019 12:58:24 +0000 Reviewed-on: https://review.openstack.org/634365 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/rabbitmq/Dockerfile.j24
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 15b61b4..8e97487 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -9,10 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9 9
10{% block rabbitmq_install %} 10{% block rabbitmq_install %}
11{% if base_package_type == 'rpm' %} 11{% if base_package_type == 'rpm' %}
12# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
13# https://bugs.launchpad.net/kolla/+bug/1814233
12 {% set rabbitmq_packages = [ 14 {% set rabbitmq_packages = [
13 'erlang-hipe', 15 'erlang-hipe',
14 'hostname', 16 'hostname',
15 'rabbitmq-server' 17 'rabbitmq-server-3.7.10'
16 ] %} 18 ] %}
17 19
18{% elif base_package_type == 'deb' %} 20{% elif base_package_type == 'deb' %}