Add pacific release

Add the 16th ceph release: pacific.

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 3b31f8f356072be71af0999ff928e005ae76614d..b0d43469d9110b9edd50f50cddbfb7c38ae1ad27 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -29,6 +29,7 @@ dummy:
 #  mimic: 13
 #  nautilus: 14
 #  octopus: 15
+#  pacific: 16
 #  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 092e93628138664e4b29351115c32a647cb30409..0ae3dbb406534c64905aec712536ff6716c3a19c 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -29,6 +29,7 @@ dummy:
 #  mimic: 13
 #  nautilus: 14
 #  octopus: 15
+#  pacific: 16
 #  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...

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

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

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 7e98826d95b2496fea39ed9e923d87790ecb659f..3644eab8d71ba31c433343790e63796992fe0413 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -21,6 +21,7 @@ ceph_release_num:
   mimic: 13
   nautilus: 14
   octopus: 15
+  pacific: 16
   dev: 99
 
 # Directory to fetch cluster fsid, keys etc...

diff --git a/tests/conftest.py b/tests/conftest.py
index 0d8a01e2b6825c942e037a175638a62c94d3230b..23130b87a8a3eebe6870afb4dd0f04363eb2fc4a 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -109,6 +109,7 @@ def node(host, request):
         'mimic': 13,
         'nautilus': 14,
         'octopus': 15,
+        'pacific': 16,
         'dev': 99
     }