From: Vasu Kulkarni <vasu@redhat.com>
Date: Fri, 14 Jul 2017 21:24:29 +0000 (-0700)
Subject: Add option to specify bluestore/filestore options
X-Git-Tag: v12.1.2~96^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2fa0fae72f145c2d300e440acdcc40516c0a95d8;p=ceph.git

Add option to specify bluestore/filestore options

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index 1b4040425bb4..eb287525290b 100644
--- a/qa/tasks/ceph_deploy.py
+++ b/qa/tasks/ceph_deploy.py
@@ -329,6 +329,11 @@ def build_ceph_cluster(ctx, config):
                 if estatus != 0:
                     raise RuntimeError("ceph-deploy: Failed to zap osds")
             osd_create_cmd = './ceph-deploy osd create '
+            # first check for filestore, default is bluestore with ceph-deploy
+            if config.get('filestore') is not None:
+                osd_create_cmd += '--filestore '
+            else:
+                osd_create_cmd += '--bluestore '
             if config.get('dmcrypt') is not None:
                 osd_create_cmd += '--dmcrypt '
             osd_create_cmd += ":".join(d)
@@ -689,6 +694,10 @@ def task(ctx, config):
              mon_initial_members: 1
              only_mon: true
              keep_running: true
+             # either choose bluestore or filestore, default is bluestore
+             bluestore: True
+             # or
+             filestore: True
 
         tasks:
         - install: