bugfix: Add missing conditions for kraken release

76ddcbc introduced an issue by removing some needed conditions on tasks
that need to be run only on release >= kraken.

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 3986661a375c16973d1c8faf4a15aa83fd55d381..5feee3c49e36b9e3952d8362263381f10e2aebba 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -8,6 +8,7 @@
   always_run: true
   when:
     - cephx
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
 
 # NOTE (leseb): wait for mon discovery and quorum resolution
 # the admin key is not instantaneously created so we have to wait a bit

diff --git a/roles/ceph-mon/tasks/create_mds_filesystems.yml b/roles/ceph-mon/tasks/create_mds_filesystems.yml
index 27941f25251ca8257d35d074d527195149d62987..d9a89ca77f8d5f940322690028b3cf84b397d1e8 100644 (file)
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@ -18,11 +18,13 @@
   command: ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it
   changed_when: false
   when:
+  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
   - mds_allow_multimds
 
 - name: set max_mds
   command: ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}
   changed_when: false
   when:
+  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
   - mds_allow_multimds
   - mds_max_mds > 1

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 59cbf08514b987c1110bdb31c8412d9491afe09b..a89f8416713914645096dd402a1487c9401e7cc6 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -21,6 +21,7 @@
   when:
     - rgw_zone is defined
     - rgw_multisite
+    - ( ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel )
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False