Merge "Use delorean rabbitmq"

ansible/group_vars/all.yml

@@ -285,7 +285,7 @@ enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}"
 # RabbitMQ options
 ####################
 rabbitmq_user: "openstack"
-rabbitmq_version: "rabbitmq_server-3.5.7/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
+rabbitmq_version: "rabbitmq_server-3.6.2/plugins/rabbitmq_clusterer-3.6.2.ez/rabbitmq_clusterer-3.6.x-667f92b0/ebin"
 
 ####################
 # HAProxy options

docker/rabbitmq/Dockerfile.j2

@@ -6,14 +6,17 @@ MAINTAINER {{ maintainer }}
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
     {% set rabbitmq_packages = [
         'hostname',
-        'https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm'
+        'rabbitmq-server'
     ] %}
 
 {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
 
 {% elif base_distro == 'ubuntu' %}
     {% set rabbitmq_packages = [
-        'rabbitmq-server'
+        'erlang-nox',
+        'socat',
+        'logrotate',
+        'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb'
     ] %}
 
 {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
@@ -21,7 +24,7 @@ MAINTAINER {{ maintainer }}
 {% elif base_distro == 'debian' %}
     {% set rabbitmq_packages = [
         'erlang-nox',
-        'http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb'
+        'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb'
     ] %}
 
 {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
@@ -29,15 +32,18 @@ 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.
+
 RUN rm -rf /var/lib/rabbitmq/* \
-    && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.7/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez \
+    && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.2/plugins/rabbitmq_clusterer-3.6.2.ez http://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \
     && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
        rabbitmq_management \
        rabbitmq_clusterer \
     && /bin/true
+
 {% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start

releasenotes/notes/rabbit-3.6.2-accdb2d3ecd493cc.yaml

@@ -0,0 +1,3 @@
+---
+upgrade:
+  - RabbitMQ version was increased to 3.6.2