openstack
/
kolla
Code Issues Proposed changes

Merge "[bifrost] Drop workarounds"

This commit is contained in:
Zuul 2021-10-06 14:55:00 +00:00 committed by Gerrit Code Review
parent 258938be3b c4d227cddc
commit 7652ef325e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,15 +31,6 @@ RUN ln -s bifrost-base-source/* bifrost \
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 \
&& dnf clean all && rm -rf /var/dnf/cache
{% elif base_package_type == 'deb' %}
RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \
&& apt-get purge -y mariadb* mysql*
{% endif %}
{# ANSIBLE_GATHER_TIMEOUT is a workaround for https://github.com/ansible/ansible/issues/43884 #}
ENV ANSIBLE_GATHER_TIMEOUT=30