Skip to content

Commit 07a4e43

Browse files
committed
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 (cherry picked from commit 7f38bce)
1 parent 77d683c commit 07a4e43

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

docker/base/Dockerfile.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
223223

224224
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
225225

226-
{# TODO(mnasiadka): Remove me once Nautilus C8S lands on mirror.centos.org #}
227-
228-
RUN sed -i \
229-
-e "s|^\(mirrorlist.*\)|#\1|" \
230-
-e "s|^#baseurl=http://mirror.centos.org.*|baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/nautilus/|" \
231-
/etc/yum.repos.d/CentOS-Ceph-Nautilus.repo
232-
233226
{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
234227

235228
{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%}

tests/templates/template_overrides.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ RUN sed -i \
3636

3737
{% block base_centos_repo_overrides_post_yum -%}
3838
{%- endraw -%}
39+
{# TODO(mnasiadka): Drop this line once baseurl in centos-ceph-nautilus has $stream instead of #}
40+
{# pointing to centos8 #}
41+
&& sed -i \
42+
-e "s|^\(mirrorlist.*\)|#\1|" \
43+
-e "s|^#baseurl=http://mirror.centos.org/\$contentdir/\$releasever|baseurl=http://{{ nodepool_mirror_host }}/\$contentdir/\$stream|" \
44+
/etc/yum.repos.d/CentOS-Ceph*.repo \
3945
&& sed -i \
4046
-e "s|^\(mirrorlist.*\)|#\1|" \
4147
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \

0 commit comments

Comments
 (0)