ceph-common: pass journal check if using bluestore

bluestore does not need any journal so we skip this test if
osd_objectstore = bluestore

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/649/head
Sébastien Han 2016-03-25 14:26:49 +01:00
parent 488491d911
commit 9098eb0a8a
1 changed files with 7 additions and 2 deletions

View File

@ -36,6 +36,7 @@
msg: "journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/" msg: "journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/"
when: when:
journal_size|int == 0 and journal_size|int == 0 and
osd_objectstore != 'bluestore' and
osd_group_name in group_names osd_group_name in group_names
- name: make sure monitor_interface or monitor_address is configured - name: make sure monitor_interface or monitor_address is configured
@ -68,7 +69,8 @@
osd_group_name in group_names and osd_group_name in group_names and
not journal_collocation and not journal_collocation and
not raw_multi_journal and not raw_multi_journal and
not osd_directory not osd_directory and
not bluestore
- name: verify only one osd scenario was chosen - name: verify only one osd scenario was chosen
fail: fail:
@ -78,7 +80,10 @@
osd_group_name in group_names and osd_group_name in group_names and
((journal_collocation and raw_multi_journal) or ((journal_collocation and raw_multi_journal) or
(journal_collocation and osd_directory) or (journal_collocation and osd_directory) or
(raw_multi_journal and osd_directory)) (raw_multi_journal and osd_directory) or
(bluestore and journal_collocation) or
(bluestore and raw_multi_journal) or
(bluestore and osd_directory))
- name: verify devices have been provided - name: verify devices have been provided
fail: fail: