diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-03 16:46:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-03 16:46:35 +0000 |
| commit | 3e405312c328e37d08c175372658f68cebc46a1f (patch) | |
| tree | 8f2e0e0df9b6d6c24fb54598014df9af54a3cda4 | |
| parent | f9f619d208413aee57309b7999227e05bcbf2e62 (diff) | |
| parent | 9d8fe891887cafa98c7102f016aee2fb48b25e48 (diff) | |
| download | kolla-3e405312c328e37d08c175372658f68cebc46a1f.tar.gz kolla-3e405312c328e37d08c175372658f68cebc46a1f.zip | |
Merge "Handle z stream change for rabbitmq-server"
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index edffdef18..71f86f5d9 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.5/plugins/rabbitmq_clusterer-3.6.x.ez/rabbitmq_clusterer-3.6.x-667f92b0/ebin" +rabbitmq_version: "rabbitmq_server-3.6/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 91b77a9d0..c1a89da21 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -40,7 +40,8 @@ MAINTAINER {{ maintainer }} # process. RUN rm -rf /var/lib/rabbitmq/* \ - && 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 \ + && ln -s /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.* /usr/lib/rabbitmq/lib/rabbitmq_server-3.6 \ + && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/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 \ |