From 33c988a6ce9fc3fe86d32d0bb97f6cb5130bf2f2 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 22 Nov 2023 05:52:05 +0000 Subject: 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 --- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kolla') diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 54396b250..241572bec 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 1b7b49a59..3ce9c6f9f 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 -- cgit v1.2.3