From 796caf7d8de33a01c4f280d67ea9d6826045330d Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 14 Mar 2018 09:57:49 -0500 Subject: [PATCH] ceph_volume: remove the subcommand argument This really isn't needed currently and I don't believe is a good mechanism for switching subcommands anwyay. The user of this module should not have to be familar with all ceph-volume subcommands. Signed-off-by: Andrew Schoen --- library/ceph_volume.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/library/ceph_volume.py b/library/ceph_volume.py index b51821291..67912f99d 100644 --- a/library/ceph_volume.py +++ b/library/ceph_volume.py @@ -24,12 +24,6 @@ options: - The ceph cluster name. required: false default: ceph - subcommand: - description: - - The ceph-volume subcommand to use. - required: false - default: lvm - choices: ['lvm'] objectstore: description: - The objectstore of the OSD, either filestore or bluestore @@ -140,7 +134,6 @@ def get_wal(wal, wal_vg): def run_module(): module_args = dict( cluster=dict(type='str', required=False, default='ceph'), - subcommand=dict(type='str', required=False, default='lvm'), objectstore=dict(type='str', required=True), data=dict(type='str', required=True), data_vg=dict(type='str', required=False), @@ -160,7 +153,6 @@ def run_module(): ) cluster = module.params['cluster'] - subcommand = module.params['subcommand'] objectstore = module.params['objectstore'] data = module.params['data'] data_vg = module.params.get('data_vg', None) @@ -177,7 +169,7 @@ def run_module(): 'ceph-volume', '--cluster', cluster, - subcommand, + 'lvm', 'create', '--%s' % objectstore, '--data',