diff options
| author | Mark Goddard <mark@stackhpc.com> | 2018-09-28 15:09:53 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2018-10-02 12:14:18 +0100 |
| commit | 840fa07f182b447ca484d749835e759d89971aba (patch) | |
| tree | 2ee31ed57943592111f799a3870395333569832a | |
| parent | 1e2db34c7fabe8591b3a84edaf92e313016caaaa (diff) | |
| download | kolla-840fa07f182b447ca484d749835e759d89971aba.tar.gz kolla-840fa07f182b447ca484d749835e759d89971aba.zip | |
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
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 05bd377ea..4bd96f977 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 %} |