Add octopus release

Add the 15th ceph release: octopus.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index ebf82e9cddbb9acab897c34a7cd3cdab30ec0967..d1a651c55b7127aa06706f5c2fd5ef2a1ce0c5be 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -28,6 +28,7 @@ dummy:
 #  luminous: 12
 #  mimic: 13
 #  nautilus: 14
+#  octopus: 15
 #  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 5c52b2f8c9061ff664f5f4c9654193e43bdb103e..b07487ba0552d5ce778505614b2839f32c39f72b 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -28,6 +28,7 @@ dummy:
 #  luminous: 12
 #  mimic: 13
 #  nautilus: 14
+#  octopus: 15
 #  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...

diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py
index 5c690d1839af1b3804f02dd7c36066e3d01bedd9..5debffe2085911d003529cf925658d3c44e78ce6 100644 (file)
--- a/plugins/actions/validate.py
+++ b/plugins/actions/validate.py
@@ -28,7 +28,7 @@ from notario.decorators import optional
 from notario.store import store as notario_store
 
 
-CEPH_RELEASES = ['jewel', 'kraken', 'luminous', 'mimic', 'nautilus']
+CEPH_RELEASES = ['jewel', 'kraken', 'luminous', 'mimic', 'nautilus', 'octopus']
 
 
 class ActionModule(ActionBase):

diff --git a/roles/ceph-common/tasks/release-rhcs.yml b/roles/ceph-common/tasks/release-rhcs.yml
index eee58e0744a3ca514acd364f2f914895295ca047..d1b31edef999bb6285e32d21f3ffeb01fc893c37 100644 (file)
--- a/roles/ceph-common/tasks/release-rhcs.yml
+++ b/roles/ceph-common/tasks/release-rhcs.yml
@@ -23,3 +23,8 @@
   set_fact:
     ceph_release: nautilus
   when: ceph_version.split('.')[0] is version_compare('14', '==')
+
+- name: set_fact ceph_release octopus
+  set_fact:
+    ceph_release: octopus
+  when: ceph_version.split('.')[0] is version_compare('15', '==')

diff --git a/roles/ceph-container-common/tasks/release.yml b/roles/ceph-container-common/tasks/release.yml
index 0f0980668d041a4960c7e424fa1114b06512b48a..d1b31edef999bb6285e32d21f3ffeb01fc893c37 100644 (file)
--- a/roles/ceph-container-common/tasks/release.yml
+++ b/roles/ceph-container-common/tasks/release.yml
@@ -24,3 +24,7 @@
     ceph_release: nautilus
   when: ceph_version.split('.')[0] is version_compare('14', '==')
 
+- name: set_fact ceph_release octopus
+  set_fact:
+    ceph_release: octopus
+  when: ceph_version.split('.')[0] is version_compare('15', '==')

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 61bd1db495d98bb7d6d5a3997731c273af26ddd1..421cb59710cbb585aaeea6428d88c4c2dbb5b536 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -20,6 +20,7 @@ ceph_release_num:
   luminous: 12
   mimic: 13
   nautilus: 14
+  octopus: 15
   dev: 99
 
 # Directory to fetch cluster fsid, keys etc...