From 33c988a6ce9fc3fe86d32d0bb97f6cb5130bf2f2 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 22 Nov 2023 05:52:05 +0000 Subject: [PATCH] Update Ceph repo name for dnf config-manager command Since change I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e we install the centos-release-ceph-reef package as a dependency, but some code was still expecting the quincy package. Change-Id: I8ebcf815d80f3bead25e0078d69b34e17ad013bd --- docker/base/Dockerfile.j2 | 2 +- docker/base/ci-centos.repo | 6 +++--- docker/base/ci-rocky.repo | 6 +++--- docker/cinder/cinder-base/Dockerfile.j2 | 2 +- docker/manila/manila-share/Dockerfile.j2 | 2 +- docker/nova/nova-compute/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/zun/zun-compute/Dockerfile.j2 | 2 +- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 0bfebc81b6..077e9a81a4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -146,7 +146,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ # from delorean or rdo-release-* package # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ - 'centos-ceph-quincy', + 'centos-ceph-reef', 'centos-nfv-openvswitch', 'centos-opstools', 'centos-rabbitmq-38', diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo index e15954a9d2..2da510742e 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -38,9 +38,9 @@ gpgcheck=1 repo_gpgcheck=0 enabled=0 -[centos-ceph-quincy] -name=(OpenDev mirror) CentOS-$stream - Ceph Quincy -baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ +[centos-ceph-reef] +name=(OpenDev mirror) CentOS-$stream - Ceph Reef +baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/docker/base/ci-rocky.repo b/docker/base/ci-rocky.repo index 76fa85efc5..736b5fcc1c 100644 --- a/docker/base/ci-rocky.repo +++ b/docker/base/ci-rocky.repo @@ -1,6 +1,6 @@ -[centos-ceph-quincy] -name=(OpenDev mirror) CentOS-$stream - Ceph Quincy -baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ +[centos-ceph-reef] +name=(OpenDev mirror) CentOS-$stream - Ceph Reef +baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 1a661af78d..fa8d2ca484 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cinder') }} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% if base_package_type == 'rpm' %} {% set cinder_base_packages = [ diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 8ed170db4a..c87e602e88 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% if base_package_type == 'rpm' %} {% set manila_share_packages = [ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index b2e091aca3..085c5c331f 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} +{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 6bf1ee4712..5e9a021c24 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'libvirt', 'openvswitch']) }} +{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index 957e20e31e..45964c4a9f 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% set zun_compute_packages = [ 'ceph-common', diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 54396b2500..241572bec4 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -1,6 +1,6 @@ --- centos: - ceph: "centos-ceph-quincy" + ceph: "centos-ceph-reef" crb: "crb" epel: "epel" erlang: "rabbitmq_rabbitmq-erlang" @@ -18,7 +18,7 @@ centos: td-agent: "treasuredata" centos-aarch64: - ceph: "centos-ceph-quincy" + ceph: "centos-ceph-reef" crb: "crb" epel: "epel" erlang: "copr-hrw-erlang-for-rabbitmq" @@ -136,7 +136,7 @@ debian-aarch64: gpg_key: "treasuredata.asc" rocky: - ceph: "centos-ceph-quincy" + ceph: "centos-ceph-reef" crb: "crb" epel: "epel" erlang: "rabbitmq_rabbitmq-erlang" @@ -154,7 +154,7 @@ rocky: td-agent: "treasuredata" rocky-aarch64: - ceph: "centos-ceph-quincy" + ceph: "centos-ceph-reef" crb: "crb" epel: "epel" erlang: "copr-hrw-erlang-for-rabbitmq" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 1b7b49a59d..3ce9c6f9fd 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -55,7 +55,7 @@ class MethodsTest(base.TestCase): result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'enable') expectCmd = 'RUN dnf config-manager --enable grafana ' - expectCmd += '--enable centos-ceph-quincy || true' + expectCmd += '--enable centos-ceph-reef || true' self.assertEqual(expectCmd, result) def test_enable_repos_debian(self): @@ -167,7 +167,7 @@ class MethodsTest(base.TestCase): result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'disable') expectCmd = 'RUN dnf config-manager --disable grafana ' - expectCmd += '--disable centos-ceph-quincy || true' + expectCmd += '--disable centos-ceph-reef || true' self.assertEqual(expectCmd, result) # NOTE(hrw): there is no disabling of repos for Debian/Ubuntu