openstack/kolla-ansible
Code Issues Proposed changes

Use ubuntu Mitaka repo

Browse Source 
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
This commit is contained in:
SamYaple 2016-03-13 22:47:35 +00:00 committed by Sam Yaple
parent 9500bd239a
commit 8b3f0d0857
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
View File

@ -2,13 +2,11 @@ RABBITMQ_NODENAME=rabbit
RABBITMQ_BOOT_MODULE=rabbit_clusterer RABBITMQ_BOOT_MODULE=rabbit_clusterer
RABBITMQ_LOG_BASE=/var/log/kolla/rabbitmq RABBITMQ_LOG_BASE=/var/log/kolla/rabbitmq
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.7/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
{% if not kolla_base_distro in ['ubuntu', 'debian'] %} {% if kolla_base_distro not in ['ubuntu', 'debian'] %}
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.5/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
# See bug https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1374109 # See bug https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1374109
export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% else %}
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.4/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
{% endif %} {% endif %}
export ERL_EPMD_PORT={{ rabbitmq_epmd_port }} export ERL_EPMD_PORT={{ rabbitmq_epmd_port }}

2
docker/base/sources.list
View File

@ -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 # We need to add the Liberty repo for the updated packages they provide. The main
# ones are qemu, libvirt, and openvswitch. # 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 # MariaDB 10.0 repo
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main

5
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -23,10 +23,11 @@ RUN apt-get install -y --no-install-recommends \
qemu \ qemu \
qemu-block-extra \ qemu-block-extra \
ebtables \ ebtables \
xen-utils \ xen-utils-4.6 \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /etc/ceph \ && 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 %} {% endif %}

17
docker/rabbitmq/Dockerfile.j2
View File

@ -5,24 +5,23 @@ MAINTAINER {{ maintainer }}
RUN yum -y install \ RUN yum -y install \
hostname \ hostname \
https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_5/rabbitmq-server-3.5.5-3.noarch.rpm \ https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm \
&& yum clean all \ && 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
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends rabbitmq-server \ RUN apt-get install -y --no-install-recommends \
&& apt-get clean \ rabbitmq-server \
&& rm -rf /var/lib/rabbitmq/* \ && apt-get clean
&& 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
{% endif %} {% endif %}
# NOTE(sdake): the /bin/true unblocks the rabbitmq-plugins tool. Not sure how # 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 # or why. My suspicion is it sends a signal to the parent
# process. # 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_management \
rabbitmq_clusterer \ rabbitmq_clusterer \
&& /bin/true && /bin/true

2
tools/setup_gate.sh
View File

@ -27,7 +27,7 @@ function setup_config {
sudo cp /etc/apt/sources.list /etc/kolla/sources.list sudo cp /etc/apt/sources.list /etc/kolla/sources.list
# Append non-infra provided repos to list # Append non-infra provided repos to list
cat << EOF | sudo tee -a /etc/kolla/sources.list cat << EOF | sudo tee -a /etc/kolla/sources.list
deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main
deb http://repo.percona.com/apt trusty main deb http://repo.percona.com/apt trusty main
deb http://download.ceph.com/debian-hammer/ trusty main deb http://download.ceph.com/debian-hammer/ trusty main