From: Travis Rhoden <trhoden@redhat.com>
Date: Wed, 1 Jul 2015 20:35:22 +0000 (-0700)
Subject: [RM-12151] args.fs_type is always set
X-Git-Tag: v1.5.26~13^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d45cc1a401ad438048a8921389f037e188409a15;p=ceph-deploy.git

[RM-12151] args.fs_type is always set

It has a default value, no need to check 'if args.fs_type:'.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index 648adc9..88bbc2e 100644
--- a/ceph_deploy/osd.py
+++ b/ceph_deploy/osd.py
@@ -207,8 +207,6 @@ def prepare_disk(
         ]
     if zap:
         args.append('--zap-disk')
-    if fs_type:
-        args.extend(['--fs-type', fs_type])
     if dmcrypt:
         args.append('--dmcrypt')
         if dmcrypt_dir is not None:
@@ -217,6 +215,8 @@ def prepare_disk(
     args.extend([
         '--cluster',
         cluster,
+        '--fs-type',
+        fs_type,
         '--',
         disk,
     ])