]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph_volume: remove the subcommand argument
authorAndrew Schoen <aschoen@redhat.com>
Wed, 14 Mar 2018 14:57:49 +0000 (09:57 -0500)
committerSébastien Han <seb@redhat.com>
Tue, 10 Apr 2018 12:19:21 +0000 (14:19 +0200)
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 <aschoen@redhat.com>
library/ceph_volume.py

index b5182129117e91bbf59e03b738949e3d12981d4b..67912f99db161e04bfe08a9c25c01db3258e72ce 100644 (file)
@@ -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',