From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 31 May 2018 17:02:46 +0000 (-0500)
Subject: ceph-defaults: add the nautilus 14.x entry to ceph_release_num
X-Git-Tag: v3.2.0beta1~64
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2423e2c48f68407e50ec075ec27510f2135f0fa;p=ceph-ansible.git

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 fbfdedb31..f80452dd0 100644
--- 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 0b9a9aeca..45b7e3ed1 100644
--- 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 304c6d30c..973eb91d9 100644
--- 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 cb114b62b..eb74c4964 100644
--- 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 304c6d30c..973eb91d9 100644
--- 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', '==')