]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
[RM-12151] args.fs_type is always set
authorTravis Rhoden <trhoden@redhat.com>
Wed, 1 Jul 2015 20:35:22 +0000 (13:35 -0700)
committerTravis Rhoden <trhoden@redhat.com>
Wed, 1 Jul 2015 20:50:23 +0000 (13:50 -0700)
It has a default value, no need to check 'if args.fs_type:'.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
ceph_deploy/osd.py

index 648adc9d4fd3c981b14e8bad050e8c3044f5f187..88bbc2e8cc2ed893860d5fddc92f075ed31a50e4 100644 (file)
@@ -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,
     ])