From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 4 Apr 2019 16:52:49 +0000 (-0400)
Subject: Add octopus release
X-Git-Tag: v5.0.0alpha1~132
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5e5d5c2d8705d5a48a8359e882604cad041f69b9;p=ceph-ansible.git

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 ebf82e9cd..d1a651c55 100644
--- 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 5c52b2f8c..b07487ba0 100644
--- 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 5c690d183..5debffe20 100644
--- 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 eee58e074..d1b31edef 100644
--- 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 0f0980668..d1b31edef 100644
--- 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 61bd1db49..421cb5971 100644
--- 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...