The when conditional was improperly being checked

The scenarios were not being accurately compared to ensure that:
* A single scenario was choosen
* ONLY a single scenario was choosen

This solution does not scale for long, but that can be addressed in a
different patchset.

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index c943528a0d1cadf5d51533368b3d4b56545f64d0..962ee80c4b488e4ac791ef06e8aa490f14deb216 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,13 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - (journal_collocation and raw_multi_journal)
-      or (journal_collocation and osd_directory)
-      or (raw_multi_journal and osd_directory)
-      or (bluestore and journal_collocation)
-      or (bluestore and raw_multi_journal)
-      or (bluestore and osd_directory)
+    - (journal_collocation and not raw_multi_journal)
+      or (journal_collocation and not osd_directory)
+      or (journal_collocation and not bluestore)
+      or (raw_multi_journal and not osd_directory)
+      or (raw_multi_journal and not bluestore)
+      or (osd_directory and not bluestore)
+      or bluestore
 
 - name: verify devices have been provided
   fail: