From 9098eb0a8afdd8ea9f88272608caf08121481427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 25 Mar 2016 14:26:49 +0100 Subject: [PATCH] ceph-common: pass journal check if using bluestore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bluestore does not need any journal so we skip this test if osd_objectstore = bluestore Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/checks/check_mandatory_vars.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml index cafd1fcbc..1926077b4 100644 --- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml +++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml @@ -36,6 +36,7 @@ msg: "journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/" when: journal_size|int == 0 and + osd_objectstore != 'bluestore' and osd_group_name in group_names - name: make sure monitor_interface or monitor_address is configured @@ -68,7 +69,8 @@ osd_group_name in group_names and not journal_collocation and not raw_multi_journal and - not osd_directory + not osd_directory and + not bluestore - name: verify only one osd scenario was chosen fail: @@ -78,7 +80,10 @@ osd_group_name in group_names and ((journal_collocation and raw_multi_journal) 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 fail: