From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 23 Mar 2020 18:22:46 +0000 (-0400)
Subject: Add pacific release
X-Git-Tag: v6.0.0alpha1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df8f853c852f915ccfec2363309b6f6bab89eb84;p=ceph-ansible.git

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 3b31f8f35..b0d43469d 100644
--- 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 092e93628..0ae3dbb40 100644
--- 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 d1b31edef..eb0b3c255 100644
--- 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 d1b31edef..eb0b3c255 100644
--- 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 7e98826d9..3644eab8d 100644
--- 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 0d8a01e2b..23130b87a 100644
--- 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
     }