Add quincy release

Add the 17th ceph release: quincy.

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index ff385cf6a32e8bcccb19f2d82057cb33f64a6a43..bb368007a993da49ddd0b69c10fc748ec62784cd 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -30,6 +30,7 @@ dummy:
 #  nautilus: 14
 #  octopus: 15
 #  pacific: 16
+#  quincy: 17
 #  dev: 99
 
 

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 07b77e87f4e9edf8439a1523290b7b2d90dfdb6e..9d6fd5ef9b7bf03c0257f53554218f48a3a21286 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -30,6 +30,7 @@ dummy:
 #  nautilus: 14
 #  octopus: 15
 #  pacific: 16
+#  quincy: 17
 #  dev: 99
 
 

diff --git a/roles/ceph-common/tasks/release-rhcs.yml b/roles/ceph-common/tasks/release-rhcs.yml
index 058ea22d81a068c6e24d91b69a38960fe108aa3a..7b4808e38ac8e7e2f904d409db5ccc6051fbbf93 100644 (file)
--- a/roles/ceph-common/tasks/release-rhcs.yml
+++ b/roles/ceph-common/tasks/release-rhcs.yml
@@ -33,3 +33,8 @@
   set_fact:
     ceph_release: pacific
   when: ceph_version.split('.')[0] is version('16', '==')
+
+- name: set_fact ceph_release quincy
+  set_fact:
+    ceph_release: quincy
+  when: ceph_version.split('.')[0] is version('17', '==')

diff --git a/roles/ceph-container-common/tasks/release.yml b/roles/ceph-container-common/tasks/release.yml
index 058ea22d81a068c6e24d91b69a38960fe108aa3a..7b4808e38ac8e7e2f904d409db5ccc6051fbbf93 100644 (file)
--- a/roles/ceph-container-common/tasks/release.yml
+++ b/roles/ceph-container-common/tasks/release.yml
@@ -33,3 +33,8 @@
   set_fact:
     ceph_release: pacific
   when: ceph_version.split('.')[0] is version('16', '==')
+
+- name: set_fact ceph_release quincy
+  set_fact:
+    ceph_release: quincy
+  when: ceph_version.split('.')[0] is version('17', '==')

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 6e79141e913b1147e0bac5d491b7b7fdd5ecfeb8..e1d5521950b31beabcbeaa8d6c3c8f08d3235edc 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -22,6 +22,7 @@ ceph_release_num:
   nautilus: 14
   octopus: 15
   pacific: 16
+  quincy: 17
   dev: 99
 
 

diff --git a/tests/conftest.py b/tests/conftest.py
index 7713415a2d637accdf59786df7b1a42ab0e8fc9f..68f63e9f7c2a1aaa42f46ea814d485d0e8f2d5b1 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -112,6 +112,7 @@ def node(host, request):
         'nautilus': 14,
         'octopus': 15,
         'pacific': 16,
+        'quincy': 17,
         'dev': 99
     }