Move to the latest rabbitmq

This allows us to use the new simpler style conf format, as well as drop
the dependency on the deprecated clusterer plugin.

Depends-On: I921459f3e40b9e0d4af9497384e49aabf0abe79b
Change-Id: I75e00312b36e1678b90a42cf58d24652323eff27

1 files changed, 6 insertions, 3 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 9826ac765..3710a1063 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -62,7 +62,8 @@ COPY yum.conf /etc/yum.conf
         'influxdb.repo',
         'nfs_ganesha.repo',
         'opendaylight.repo',
-        'td.repo'
+        'td.repo',
+        'rabbitmq_rabbitmq-server.repo'
     ] %}
 
     {% set base_yum_repo_keys = [
@@ -327,6 +328,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       'A20F259AEB9C94BB'
     ] %}
     {% set remote_apt_keys = [
+      'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
     ] %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
@@ -340,7 +342,8 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
     {% set remote_apt_keys = [
       'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key',
       'https://bintray.com/user/downloadSubjectPublicKey?username=bintray',
-      'https://download.docker.com/linux/debian/gpg'
+      'https://download.docker.com/linux/debian/gpg',
+      'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
     ] %}
     {% set base_apt_packages = base_apt_packages +
       ['sudo',]
@@ -355,7 +358,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
             {% endif -%}
         {% endfor %}
         {% for key in remote_apt_keys | customizable('remote_apt_keys') %}
-            {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
+            {%- if loop.first %} RUN {% else %} && {% endif %}curl -L {{ key }} | apt-key add -
             {%- if not loop.last %} \
             {% endif -%}
         {% endfor %}