From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 3 Jun 2016 12:43:04 +0000 (-0400)
Subject: [RM-16140] osd: remove ability to pick ext4
X-Git-Tag: v1.5.34~3^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3eb05bdd057852705ae6532a08e8fcf1b87e4dca;p=ceph-deploy.git

[RM-16140] osd: remove ability to pick ext4

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index a3e54cd..3ce24d3 100644
--- a/ceph_deploy/osd.py
+++ b/ceph_deploy/osd.py
@@ -372,7 +372,7 @@ def activate(args, cfg):
 
         LOG.debug('activating host %s disk %s', hostname, disk)
         LOG.debug('will use init type: %s', distro.init)
-        
+
         ceph_disk_executable = system.executable_path(distro.conn, 'ceph-disk')
         remoto.process.run(
             distro.conn,
@@ -708,11 +708,10 @@ def make(parser):
         '--fs-type',
         metavar='FS_TYPE',
         choices=['xfs',
-                 'ext4',
                  'btrfs'
                  ],
         default='xfs',
-        help='filesystem to use to format DISK (xfs, btrfs, or ext4)',
+        help='filesystem to use to format DISK (xfs, btrfs)',
         )
     osd_create.add_argument(
         '--dmcrypt',
@@ -751,11 +750,10 @@ def make(parser):
         '--fs-type',
         metavar='FS_TYPE',
         choices=['xfs',
-                 'ext4',
                  'btrfs'
                  ],
         default='xfs',
-        help='filesystem to use to format DISK (xfs, btrfs, or ext4)',
+        help='filesystem to use to format DISK (xfs, btrfs)',
         )
     osd_prepare.add_argument(
         '--dmcrypt',
@@ -841,11 +839,10 @@ def make_disk(parser):
         '--fs-type',
         metavar='FS_TYPE',
         choices=['xfs',
-                 'ext4',
                  'btrfs'
                  ],
         default='xfs',
-        help='filesystem to use to format DISK (xfs, btrfs, or ext4)',
+        help='filesystem to use to format DISK (xfs, btrfs)',
         )
     disk_prepare.add_argument(
         '--dmcrypt',