Revert "Fix commit conditionals"

This reverts commit 9ed45f7367bc03ccaa5c40e574e5a5036493c856.

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index 08eb72a5a9b6811dc03190fa9a958ba19774e4c5..2cf5ba39ddba4c2c6cfa086bbd93ee6474f10cbb 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -79,12 +79,12 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - (journal_collocation|default(False) and raw_multi_journal|default(False))
-      or (journal_collocation|default(False) and osd_directory|default(False))
-      or (journal_collocation|default(False) and bluestore|default(False))
-      or (raw_multi_journal|default(False) and osd_directory|default(False))
-      or (raw_multi_journal|default(False) and bluestore|default(False))
-      or (osd_directory|default(False) and bluestore|default(False))
+    - (journal_collocation and raw_multi_journal)
+      or (journal_collocation and osd_directory)
+      or (journal_collocation and bluestore)
+      or (raw_multi_journal and osd_directory)
+      or (raw_multi_journal and bluestore)
+      or (osd_directory and bluestore)
 
 - name: verify devices have been provided
   fail: