summaryrefslogtreecommitdiff
path: root/docker/bifrost
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-06-23 11:34:09 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-09-04 07:13:58 +0000
commitfec2c701dc36ea8d246b69290f5546bf37d414b3 (patch)
tree315a4c93bc313a8b55a9b9161a7a6a2606a292c8 /docker/bifrost
parent2ff242c4a270258fed0a0dbdbd3b66a402cadece (diff)
downloadkolla-fec2c701dc36ea8d246b69290f5546bf37d414b3.tar.gz
kolla-fec2c701dc36ea8d246b69290f5546bf37d414b3.zip
Use upstream Erlang on CentOS 8
Train only. In CentOS 8 Train we had a mix of rmq upstream and rdo packages, erlang was from RDO and rmq (3.7) from rmq. As this is not really tested by any other party, I propose to unify the sources of both. Change-Id: I52094ce9e3d98cbdedfdc23c8a43dd3093ce1771 Closes-bug: #1884034
Diffstat (limited to 'docker/bifrost')
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index adc8c79dc..828a44001 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -28,7 +28,7 @@ WORKDIR /bifrost
{% if base_package_type == 'rpm' %}
{# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #}
-RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \
+RUN rm -f /etc/yum.repos.d/{rabbitmq_rabbitmq-server,rabbitmq_rabbitmq-erlang}.repo \
{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --enable epel \
{% else %}