openstack/kolla
Code Issues Proposed changes

Use rabbitmq package from OS distro for Bifrost

Browse Source 
The recent change to upgrade RabbitMQ broke deployment of Bifrost, since
it does not support the newer version of RabbitMQ. This change reverts
the bifrost image to use the package provided by the OS.

Change-Id: Id6c9b879727734ea2c03b2d69e1a673354f52617
This commit is contained in:
Mark Goddard 2018-09-28 15:09:53 +01:00
parent 1e2db34c7f
commit 840fa07f18
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -26,8 +26,13 @@ RUN ln -s bifrost-base-source/* bifrost \
WORKDIR /bifrost
{% if base_distro in ['debian', 'ubuntu'] %}
RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql*
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #}
RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \
&& yum clean all && rm -rf /var/yum/cache
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \
&& apt-get purge -y mariadb* mysql*
{% endif %}
{% block bifrost_ansible_install %}