From 9ed45f7367bc03ccaa5c40e574e5a5036493c856 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 1 Jun 2016 18:14:13 +0000 Subject: [PATCH] Fix commit conditionals The goal is to _fail_ this when conditional when one (and only one) is set. The 'not's were incorrectly added. --- .../tasks/checks/check_mandatory_vars.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml index 962ee80c4..2cf5ba39d 100644 --- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml +++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml @@ -79,13 +79,12 @@ 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: