diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-10-02 15:06:40 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-10-02 15:06:40 +0000 |
| commit | c4d227cddca59694e992d9054940bc6057d1b1b3 (patch) | |
| tree | 6f73152308a66d3bbdecff55332bf7953577b760 /docker | |
| parent | c729bc21e87e0fa55563b36d714db595104b45ac (diff) | |
| download | kolla-c4d227cddca59694e992d9054940bc6057d1b1b3.tar.gz kolla-c4d227cddca59694e992d9054940bc6057d1b1b3.zip | |
[bifrost] Drop workarounds
These are no longer required but block other cleanups.
Change-Id: I13bc63447da878890730e9458b48267a8530d5af
Diffstat (limited to 'docker')
| -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 |