From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 27 Jul 2017 18:17:31 +0000 (-0700)
Subject: use elif instead of else to handle cases for jewel install
X-Git-Tag: v13.0.1~999^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3ec7cabf66c76d712f77a4dfefe96f374507982;p=ceph.git

use elif instead of else to handle cases for jewel install

jewel needs neither filestore or bluestore as an option, so provide none
when running with jewel branch.

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

diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index b8847b15453b..a06183df723f 100644
--- a/qa/tasks/ceph_deploy.py
+++ b/qa/tasks/ceph_deploy.py
@@ -342,7 +342,7 @@ def build_ceph_cluster(ctx, config):
             # first check for filestore, default is bluestore with ceph-deploy
             if config.get('filestore') is not None:
                 osd_create_cmd += '--filestore '
-            else:
+            elif config.get('bluestore') is not None:
                 osd_create_cmd += '--bluestore '
             if config.get('dmcrypt') is not None:
                 osd_create_cmd += '--dmcrypt '