diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-15 02:35:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-15 02:35:47 +0000 |
| commit | 439188cedbae289897d9d392681096928023258d (patch) | |
| tree | 1966449921ee239ea740e4b631acc7cf3265267f /docker | |
| parent | 302b0302166ddfec43608e34bbcfaff6ce0c4545 (diff) | |
| parent | 8b3f0d085712154d580e4a464ca7e88e612f2fb2 (diff) | |
| download | kolla-439188cedbae289897d9d392681096928023258d.tar.gz kolla-439188cedbae289897d9d392681096928023258d.zip | |
Merge "Use ubuntu Mitaka repo"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/sources.list | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 19 |
3 files changed, 13 insertions, 13 deletions
diff --git a/docker/base/sources.list b/docker/base/sources.list index 3a6684490..9e19fe490 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -8,7 +8,7 @@ deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe # We need to add the Liberty repo for the updated packages they provide. The main # ones are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main # MariaDB 10.0 repo deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index fb1f396af..028d4635a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -23,10 +23,11 @@ RUN apt-get install -y --no-install-recommends \ qemu \ qemu-block-extra \ ebtables \ - xen-utils \ + xen-utils-4.6 \ && apt-get clean \ && mkdir -p /etc/ceph \ - && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml + && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \ + && sed -i 's|.*stdio_handler.*|stdio_handler = "file"|' /etc/libvirt/qemu.conf {% endif %} 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 |