]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Fix commit conditionals
authorSam Yaple <sam@yaple.net>
Wed, 1 Jun 2016 18:14:13 +0000 (18:14 +0000)
committerSam Yaple <sam@yaple.net>
Wed, 1 Jun 2016 18:15:13 +0000 (18:15 +0000)
The goal is to _fail_ this when conditional when one (and only one) is
set. The 'not's were incorrectly added.

roles/ceph-common/tasks/checks/check_mandatory_vars.yml

index 962ee80c4b488e4ac791ef06e8aa490f14deb216..2cf5ba39ddba4c2c6cfa086bbd93ee6474f10cbb 100644 (file)
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - (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
+    - (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: