From 840fa07f182b447ca484d749835e759d89971aba Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 28 Sep 2018 15:09:53 +0100 Subject: [PATCH] Use rabbitmq package from OS distro for Bifrost 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 --- docker/bifrost/bifrost-base/Dockerfile.j2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 05bd377ea2..4bd96f9771 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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 %}