ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <aschoen@redhat.com>
pull/2233/merge
Andrew Schoen 2018-03-14 09:57:49 -05:00 committed by Sébastien Han
parent d1f2d64b15
commit 796caf7d8d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ceph_volume.py
View File

@ -24,12 +24,6 @@ options:
- The ceph cluster name. - The ceph cluster name.
required: false required: false
default: ceph default: ceph
subcommand:
description:
- The ceph-volume subcommand to use.
required: false
default: lvm
choices: ['lvm']
objectstore: objectstore:
description: description:
- The objectstore of the OSD, either filestore or bluestore - The objectstore of the OSD, either filestore or bluestore
@ -140,7 +134,6 @@ def get_wal(wal, wal_vg):
def run_module(): def run_module():
module_args = dict( module_args = dict(
cluster=dict(type='str', required=False, default='ceph'), cluster=dict(type='str', required=False, default='ceph'),
subcommand=dict(type='str', required=False, default='lvm'),
objectstore=dict(type='str', required=True), objectstore=dict(type='str', required=True),
data=dict(type='str', required=True), data=dict(type='str', required=True),
data_vg=dict(type='str', required=False), data_vg=dict(type='str', required=False),
@ -160,7 +153,6 @@ def run_module():
) )
cluster = module.params['cluster'] cluster = module.params['cluster']
subcommand = module.params['subcommand']
objectstore = module.params['objectstore'] objectstore = module.params['objectstore']
data = module.params['data'] data = module.params['data']
data_vg = module.params.get('data_vg', None) data_vg = module.params.get('data_vg', None)
@ -177,7 +169,7 @@ def run_module():
'ceph-volume', 'ceph-volume',
'--cluster', '--cluster',
cluster, cluster,
subcommand, 'lvm',
'create', 'create',
'--%s' % objectstore, '--%s' % objectstore,
'--data', '--data',