diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-08 14:50:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-08 14:50:32 +0000 |
| commit | 6a801d70725734bc6b6f795267c8f8883e6a084e (patch) | |
| tree | 97b7b500bdab42da28836b2d49499b80996da19f /kolla | |
| parent | 18b3eea03ee1c23b770808e57036f1ee6f0b7346 (diff) | |
| parent | c6cba08314816346a9b759bb5da0a2c4ae1a41a6 (diff) | |
| download | kolla-6a801d70725734bc6b6f795267c8f8883e6a084e.tar.gz kolla-6a801d70725734bc6b6f795267c8f8883e6a084e.zip | |
Merge "ceph: Update CentOS packages to Pacific"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/template/methods.py | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 5 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 168f30451..420a70306 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -76,7 +76,7 @@ def handle_repos(context, reponames, mode): """NOTE(hrw): we need to handle CentOS, Debian and Ubuntu with one macro. Repo names have to be simple names mapped to proper ones. So 'ceph' == - 'centos-ceph-nautilus' for CentOS, UCA for Ubuntu (enabled by default) and + 'centos-ceph-pacific' for CentOS, UCA for Ubuntu (enabled by default) and something else for Debian. Distro/arch are not required to have all entries - we ignore missing ones. """ diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 225e94d24..996fc0ab4 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -1,7 +1,6 @@ --- -# TODO(mnasiadka): Rework the repo list once Ceph Octopus is released centos: - ceph: "centos-ceph-nautilus" + ceph: "centos-ceph-pacific" elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" @@ -21,7 +20,7 @@ centos: td-agent: "treasuredata" centos-aarch64: - ceph: "centos-ceph-nautilus" + ceph: "centos-ceph-pacific" elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 81bb29946..16b40c17f 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-nautilus || true' + expectCmd += '--enable centos-ceph-pacific || true' self.assertEqual(expectCmd, result) def test_enable_repos_debian(self): @@ -145,7 +145,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-nautilus || true' + expectCmd += '--disable centos-ceph-pacific || true' self.assertEqual(expectCmd, result) # NOTE(hrw): there is no disabling of repos for Debian/Ubuntu |