update ceph source to reef 18.2.0

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / lvm / common.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/lvm/common.py b/ceph/src/ceph-volume/ceph_volume/devices/lvm/common.py
index edc8e1cbce117c377b60bf36d97b04090b9072e5..35e53181aff07021d83df92eb31d02ef5e4ed4ad 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/lvm/common.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/lvm/common.py
@@ -126,33 +126,12 @@ bluestore_args = {
     },
 }
 
-filestore_args = {
-    '--filestore': {
-        'action': 'store_true',
-        'help': 'Use the filestore objectstore',
-    },
-    '--journal': {
-        'help': 'A logical volume (vg_name/lv_name), or path to a device',
-        'type': arg_validators.ValidDevice(as_string=True),
-    },
-    '--journal-size': {
-        'help': 'Size of journal LV in case a raw block device was passed in --journal',
-        'default': '0',
-        'type': disk.Size.parse
-    },
-    '--journal-slots': {
-        'help': ('Intended number of slots on journal device. The new OSD gets one'
-              'of those slots or 1/nth of the available capacity'),
-        'type': int,
-        'default': 1,
-    },
-}
 
 def get_default_args():
     defaults = {}
     def format_name(name):
         return name.strip('-').replace('-', '_').replace('.', '_')
-    for argset in (common_args, filestore_args, bluestore_args):
+    for argset in (common_args, bluestore_args):
         defaults.update({format_name(name): val.get('default', None) for name, val in argset.items()})
     return defaults
 
@@ -168,7 +147,6 @@ def common_parser(prog, description):
         description=description,
     )
 
-    filestore_group = parser.add_argument_group('filestore')
     bluestore_group = parser.add_argument_group('bluestore')
 
     for name, kwargs in common_args.items():
@@ -177,9 +155,6 @@ def common_parser(prog, description):
     for name, kwargs in bluestore_args.items():
         bluestore_group.add_argument(name, **kwargs)
 
-    for name, kwargs in filestore_args.items():
-        filestore_group.add_argument(name, **kwargs)
-
     # Do not parse args, so that consumers can do something before the args get
     # parsed triggering argparse behavior
     return parser