From c6cba08314816346a9b759bb5da0a2c4ae1a41a6 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 2 Sep 2021 09:19:05 +0100
Subject: ceph: Update CentOS packages to Pacific

Updates the CentOS images to use centos-release-ceph-pacific. This is
in line with Ubuntu which gets Pacific from UCA. Debian remains on
Nautilus.

Change-Id: Ie1e77f9c7d83538c051362a8972745f184c72019
---
 doc/source/ceph_versions.csv                                 | 2 +-
 docker/base/Dockerfile.j2                                    | 4 ++--
 kolla/template/methods.py                                    | 2 +-
 kolla/template/repos.yaml                                    | 5 ++---
 kolla/tests/test_methods.py                                  | 4 ++--
 releasenotes/notes/centos-ceph-pacific-40c55be6721cb1ac.yaml | 4 ++++
 6 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/centos-ceph-pacific-40c55be6721cb1ac.yaml

diff --git a/doc/source/ceph_versions.csv b/doc/source/ceph_versions.csv
index 8da9f0fbb..93880cafa 100644
--- a/doc/source/ceph_versions.csv
+++ b/doc/source/ceph_versions.csv
@@ -1,5 +1,5 @@
 Distro,Ceph,
 ,Source, Release
-CentOS,CentOS Storage SIG,Nautilus
+CentOS,CentOS Storage SIG,Pacific
 Ubuntu,Ubuntu Cloud Archive,Pacific
 Debian,Debian,Nautilus
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 0ebbdbb87..b6344b37d 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -154,7 +154,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 
 {% set base_centos_yum_repo_packages = [
     'centos-release-advanced-virtualization',
-    'centos-release-ceph-nautilus',
+    'centos-release-ceph-pacific',
     'centos-release-nfv-extras',
     'centos-release-nfv-openvswitch',
     'centos-release-opstools',
@@ -177,7 +177,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-nfv-extras',
     'centos-nfv-ovs',
     'centos-advanced-virtualization',
-    'centos-ceph-nautilus',
+    'centos-ceph-pacific',
     'centos-nfv-openvswitch',
     'centos-opstools',
     'centos-rabbitmq-38',
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 94e979063..2d526510d 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
diff --git a/releasenotes/notes/centos-ceph-pacific-40c55be6721cb1ac.yaml b/releasenotes/notes/centos-ceph-pacific-40c55be6721cb1ac.yaml
new file mode 100644
index 000000000..1c840e73e
--- /dev/null
+++ b/releasenotes/notes/centos-ceph-pacific-40c55be6721cb1ac.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Updates Ceph client packages in CentOS images to Pacific.
-- 
cgit v1.2.3