diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-06 14:55:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-06 14:55:00 +0000 |
| commit | 7652ef325e0e84fe92ccf104bfe751a4d3542227 (patch) | |
| tree | bf53f69ce21a11ef50647deab8208cf9c8ad27e0 | |
| parent | 258938be3bebfa540cdda5f385dc1402a2e36c3a (diff) | |
| parent | c4d227cddca59694e992d9054940bc6057d1b1b3 (diff) | |
| download | kolla-7652ef325e0e84fe92ccf104bfe751a4d3542227.tar.gz kolla-7652ef325e0e84fe92ccf104bfe751a4d3542227.zip | |
Merge "[bifrost] Drop workarounds"
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 10e895441..e05d80218 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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 |