diff options
| author | SamYaple <sam@yaple.net> | 2016-03-13 22:47:35 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2016-03-14 15:52:48 +0000 |
| commit | 8b3f0d085712154d580e4a464ca7e88e612f2fb2 (patch) | |
| tree | 83d9fae3ea95c00333ffbf6252aad87329ee81e7 /docker/rabbitmq | |
| parent | 9500bd239ac122ae41de6086112e5e5335ed1558 (diff) | |
| download | kolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.tar.gz kolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.zip | |
Use ubuntu Mitaka repo
The rabbitmq-server package is upgraded to 3.5.7 in cloud-archive
so we update centos to match
The xen-utils package now needs an explict version, xen-utils-4.6 is
what is provided by cloud-archive mitaka
Libvirt 1.3 is in the ubuntu cloud-archive. This has a new daemon for
logging that needs further implementation in newton. For now, it has
been disabled within the qemu.conf
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
TrivialFix
Change-Id: I84217824817c484b6800a64cbd7767b127a3098e
Diffstat (limited to 'docker/rabbitmq')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 75f5d488b..b9c967b9a 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -5,24 +5,23 @@ MAINTAINER {{ maintainer }} RUN yum -y install \ hostname \ - https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_5/rabbitmq-server-3.5.5-3.noarch.rpm \ - && yum clean all \ - && rm -rf /var/lib/rabbitmq/* \ - && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.5/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez + https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm \ + && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends rabbitmq-server \ - && apt-get clean \ - && rm -rf /var/lib/rabbitmq/* \ - && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.4/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez +RUN apt-get install -y --no-install-recommends \ + rabbitmq-server \ + && apt-get clean {% endif %} # 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 /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ +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 \ + && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ rabbitmq_management \ rabbitmq_clusterer \ && /bin/true @@ -36,4 +35,4 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {{ include_footer }} -USER rabbitmq
\ No newline at end of file +USER rabbitmq |