diff options
| author | Steven Dake <stdake@cisco.com> | 2016-09-29 23:50:33 -0700 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-03 06:51:45 +0000 |
| commit | 0226cca1a25c59ace8433650c81f83d0b78d9a33 (patch) | |
| tree | ea00e3d43af3206e7b684a9874ff744e705bacbe | |
| parent | 195bcd0f4323462b77d025936b898c85ddd8fdb3 (diff) | |
| download | kolla-0226cca1a25c59ace8433650c81f83d0b78d9a33.tar.gz kolla-0226cca1a25c59ace8433650c81f83d0b78d9a33.zip | |
Download the rabbitmq_clusterer plugins to the correct path
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
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index c708e8cdb..edffdef18 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -306,7 +306,7 @@ enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}" # RabbitMQ options #################### 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 diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 8e25ec65a..91b77a9d0 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }} 'erlang-nox', 'socat', '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")) }} @@ -26,7 +26,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro == 'debian' %} {% set rabbitmq_packages = [ '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")) }} @@ -40,7 +40,7 @@ MAINTAINER {{ maintainer }} # process. 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 \ rabbitmq_management \ rabbitmq_clusterer \ |