ceph-defaults: add the nautilus 14.x entry to ceph_release_num

The first 14.x tag has been cut so this needs to be added so that
version detection will still work on the master branch of ceph.

Fixes: https://github.com/ceph/ceph-ansible/issues/2671
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index fbfdedb311cd0ef60b317a1d0cf72bc4d35b44a7..f80452dd0fab0daaeccf2f614f8ba04fc259fa95 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -27,6 +27,7 @@ dummy:
 #  kraken: 11
 #  luminous: 12
 #  mimic: 13
+#  nautilus: 14
 
 # Directory to fetch cluster fsid, keys etc...
 #fetch_directory: fetch/

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 0b9a9aeca33b470b36c3aa11c7cde6f040c1723f..45b7e3ed10898290dbb45e87272efb71f7089055 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -27,6 +27,7 @@ dummy:
 #  kraken: 11
 #  luminous: 12
 #  mimic: 13
+#  nautilus: 14
 
 # Directory to fetch cluster fsid, keys etc...
 fetch_directory: ~/ceph-ansible-keys

diff --git a/roles/ceph-common/tasks/release-rhcs.yml b/roles/ceph-common/tasks/release-rhcs.yml
index 304c6d30c2a9a5a0f59e4ae6e261a7b4a314a1f8..973eb91d969214edcb4d13ee4c7abeee892aee13 100644 (file)
--- a/roles/ceph-common/tasks/release-rhcs.yml
+++ b/roles/ceph-common/tasks/release-rhcs.yml
@@ -22,3 +22,9 @@
     ceph_release: mimic
   when:
     - ceph_version.split('.')[0] | version_compare('13', '==')
+
+- name: set_fact ceph_release nautilus
+  set_fact:
+    ceph_release: nautilus
+  when:
+    - ceph_version.split('.')[0] | version_compare('14', '==')

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index cb114b62b5b3d73523decd3ad02c34f5cada87f6..eb74c496418356b9e98230fa157ab265df4bef46 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -19,6 +19,7 @@ ceph_release_num:
   kraken: 11
   luminous: 12
   mimic: 13
+  nautilus: 14
 
 # Directory to fetch cluster fsid, keys etc...
 fetch_directory: fetch/

diff --git a/roles/ceph-docker-common/tasks/release.yml b/roles/ceph-docker-common/tasks/release.yml
index 304c6d30c2a9a5a0f59e4ae6e261a7b4a314a1f8..973eb91d969214edcb4d13ee4c7abeee892aee13 100644 (file)
--- a/roles/ceph-docker-common/tasks/release.yml
+++ b/roles/ceph-docker-common/tasks/release.yml
@@ -22,3 +22,9 @@
     ceph_release: mimic
   when:
     - ceph_version.split('.')[0] | version_compare('13', '==')
+
+- name: set_fact ceph_release nautilus
+  set_fact:
+    ceph_release: nautilus
+  when:
+    - ceph_version.split('.')[0] | version_compare('14', '==')