Revert "Fix commit conditionals"

This reverts commit 9ed45f7367.
pull/831/head
Sam Yaple 2016-06-02 14:45:00 +00:00
parent 59dd3223e7
commit cbbf87eb42
1 changed files with 6 additions and 6 deletions

View File

@ -79,12 +79,12 @@
when: when:
- osd_group_name is defined - osd_group_name is defined
- osd_group_name in group_names - osd_group_name in group_names
- (journal_collocation|default(False) and raw_multi_journal|default(False)) - (journal_collocation and raw_multi_journal)
or (journal_collocation|default(False) and osd_directory|default(False)) or (journal_collocation and osd_directory)
or (journal_collocation|default(False) and bluestore|default(False)) or (journal_collocation and bluestore)
or (raw_multi_journal|default(False) and osd_directory|default(False)) or (raw_multi_journal and osd_directory)
or (raw_multi_journal|default(False) and bluestore|default(False)) or (raw_multi_journal and bluestore)
or (osd_directory|default(False) and bluestore|default(False)) or (osd_directory and bluestore)
- name: verify devices have been provided - name: verify devices have been provided
fail: fail: