diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-04 15:57:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-04 15:57:38 +0000 |
| commit | db61b2fed0c4af525c530986d13cce5975bf59a1 (patch) | |
| tree | 5e6bd60d37d046191535d36495469a987aa95073 | |
| parent | 5c2fa32e63d86ed51ac668b5958f967b055b0f18 (diff) | |
| parent | 840fa07f182b447ca484d749835e759d89971aba (diff) | |
| download | kolla-db61b2fed0c4af525c530986d13cce5975bf59a1.tar.gz kolla-db61b2fed0c4af525c530986d13cce5975bf59a1.zip | |
Merge "Use rabbitmq package from OS distro for Bifrost"
| -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 %} |