openstack/kolla-ansible
Code Issues Proposed changes

Download the rabbitmq_clusterer plugins to the correct path

Browse Source 
rabbitmq-server version upgrade to 3.6.5 in RDO repo. This patch set

* Download the rabbitmq_clusterer plugins to the correct path
* Install 3.6.5 rabbitmq-server for Ubuntu/Debian distro

Closes-Bug: #1611655
Co-Authored-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: I8de9a553b506a15f4d96cc6b55f21e3a27887a1d
This commit is contained in:
Steven Dake 2016-09-29 23:50:33 -07:00 committed by Jeffrey Zhang
parent 195bcd0f43
commit 0226cca1a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

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

6
docker/rabbitmq/Dockerfile.j2
View File

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
'erlang-nox', 'erlang-nox',
'socat', 'socat',
'logrotate', 'logrotate',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb' 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb'
] %} ] %}
{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
@ -26,7 +26,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro == 'debian' %} {% elif base_distro == 'debian' %}
{% set rabbitmq_packages = [ {% set rabbitmq_packages = [
'erlang-nox', 'erlang-nox',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb' 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb'
] %} ] %}
{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
@ -40,7 +40,7 @@ MAINTAINER {{ maintainer }}
# process. # process.
RUN rm -rf /var/lib/rabbitmq/* \ RUN rm -rf /var/lib/rabbitmq/* \
&& 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 \ && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.5/plugins/rabbitmq_clusterer-3.6.x-667f92b0.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 \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
rabbitmq_management \ rabbitmq_management \
rabbitmq_clusterer \ rabbitmq_clusterer \