Updated release version check

diff --git a/roles/ceph-mon/tasks/create_mds_filesystems.yml b/roles/ceph-mon/tasks/create_mds_filesystems.yml
index fd34f6d05f86525697f6987280f2b2c998915bfe..8b784f35deeb5c954dded33e7b2107a725ded3a8 100644 (file)
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@ -9,9 +9,9 @@
     - cephfs_data
     - cephfs_metadata
   changed_when: false
-  when: not {{ ceph_version | version_compare('0.84.0', '<') }}
+  when: ceph_release_num.{{ ceph_release }} > ceph_release_num.firefly
 
 - name: create ceph filesystem
   command: ceph --cluster {{ cluster }} fs new {{ cephfs }} {{ cephfs_metadata }} {{ cephfs_data }}
   changed_when: false
-  when: not {{ ceph_version | version_compare('0.84.0', '<') }}
+  when: ceph_release_num.{{ ceph_release }} > ceph_release_num.firefly

diff --git a/roles/ceph-mon/tasks/secure_cluster.yml b/roles/ceph-mon/tasks/secure_cluster.yml
index 9c67becea98bb563c8478b69b6e645760d4cec98..a12d08f494d7c6ae0faf427ee62106e9b89d7cc8 100644 (file)
--- a/roles/ceph-mon/tasks/secure_cluster.yml
+++ b/roles/ceph-mon/tasks/secure_cluster.yml
@@ -9,4 +9,4 @@
   with_nested:
     - "{{ ceph_pools.stdout_lines|default([]) }}"
     - secure_cluster_flags
-  when: "{{ ceph_version | version_compare('0.94.0', '>=') }}"
+  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.hammer