From 7f38bce812ccb621a089755526f79bd792f4e071 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 8 Feb 2022 09:11:48 +0100 Subject: [PATCH] base: Drop usage of Ceph Nautilus from RDO This was temporary due to missing Ceph Nautilus repo on CentOS mirrors (after removing CentOS Linux content on EOL date). Change-Id: I86aa697b8def34e0cfb11d2f5ad903dd54e975ef --- docker/base/Dockerfile.j2 | 7 ------- tests/templates/template_overrides.j2 | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8bfc51f125..77a050c55d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -219,13 +219,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} -{# TODO(mnasiadka): Remove this once Nautilus C8S lands on mirror.centos.org #} - -RUN sed -i \ - -e "s|^\(mirrorlist.*\)|#\1|" \ - -e "s|^#baseurl=http://mirror.centos.org.*|baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/nautilus/|" \ - /etc/yum.repos.d/CentOS-Ceph-Nautilus.repo - {%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%} {%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%} diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 7fdf25fb81..be9145de97 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -36,6 +36,12 @@ RUN sed -i \ {% block base_centos_repo_overrides_post_yum -%} {%- endraw -%} +{# TODO(mnasiadka): Drop this line once baseurl in centos-ceph-nautilus has $stream instead of #} +{# pointing to centos8 #} + && sed -i \ + -e "s|^\(mirrorlist.*\)|#\1|" \ + -e "s|^#baseurl=http://mirror.centos.org/\$contentdir/\$releasever|baseurl=http://{{ nodepool_mirror_host }}/\$contentdir/\$stream|" \ + /etc/yum.repos.d/CentOS-Ceph*.repo \ && sed -i \ -e "s|^\(mirrorlist.*\)|#\1|" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \