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

Revert "cv: support zap by osd fsid" 

This reverts commit 8454f0144a.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3944/head v3.2.15
Guillaume Abrioux 2019-04-25 17:45:46 +02:00
parent 043ee8c158
commit addcc1e61a
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/ceph_volume.py
View File

@ -48,10 +48,6 @@ options:
description: description:
- If data is a lv, this must be the name of the volume group it belongs to. - If data is a lv, this must be the name of the volume group it belongs to.
required: false required: false
osd_fsid:
description:
- The OSD FSID
required: false
journal: journal:
description: description:
- The logical volume name or partition to use as a filestore journal. - The logical volume name or partition to use as a filestore journal.
@ -428,7 +424,7 @@ def zap_devices(module, container_image):
''' '''
# get module variables # get module variables
data = module.params.get('data', None) data = module.params['data']
data_vg = module.params.get('data_vg', None) data_vg = module.params.get('data_vg', None)
journal = module.params.get('journal', None) journal = module.params.get('journal', None)
journal_vg = module.params.get('journal_vg', None) journal_vg = module.params.get('journal_vg', None)
@ -436,19 +432,13 @@ def zap_devices(module, container_image):
db_vg = module.params.get('db_vg', None) db_vg = module.params.get('db_vg', None)
wal = module.params.get('wal', None) wal = module.params.get('wal', None)
wal_vg = module.params.get('wal_vg', None) wal_vg = module.params.get('wal_vg', None)
osd_fsid = module.params.get('osd_fsid', None) data = get_data(data, data_vg)
# build the CLI # build the CLI
action = 'zap' action = 'zap'
cmd = build_ceph_volume_cmd(action, container_image) cmd = build_ceph_volume_cmd(action, container_image)
cmd.append('--destroy') cmd.append('--destroy')
cmd.append(data)
if osd_fsid:
cmd.extend(['--osd-fsid', osd_fsid])
if data:
data = get_data(data, data_vg)
cmd.append(data)
if journal: if journal:
journal = get_journal(journal, journal_vg) journal = get_journal(journal, journal_vg)
@ -488,7 +478,6 @@ def run_module():
block_db_size=dict(type='str', required=False, default='-1'), block_db_size=dict(type='str', required=False, default='-1'),
report=dict(type='bool', required=False, default=False), report=dict(type='bool', required=False, default=False),
containerized=dict(type='str', required=False, default=False), containerized=dict(type='str', required=False, default=False),
osd_fsid=dict(type='str', required=False),
) )
module = AnsibleModule( module = AnsibleModule(

13
library/test_ceph_volume.py
View File

@ -83,19 +83,6 @@ class TestCephVolumeModule(object):
result = ceph_volume.zap_devices(fake_module, fake_container_image) result = ceph_volume.zap_devices(fake_module, fake_container_image)
assert result == expected_command_list assert result == expected_command_list
def test_zap_osd_fsid(self):
fake_module = MagicMock()
fake_module.params = {'osd_fsid': 'a_uuid'}
fake_container_image = None
expected_command_list = ['ceph-volume',
'lvm',
'zap',
'--destroy',
'--osd-fsid',
'a_uuid']
result = ceph_volume.zap_devices(fake_module, fake_container_image)
assert result == expected_command_list
def test_activate_osd(self): def test_activate_osd(self):
expected_command_list = ['ceph-volume', expected_command_list = ['ceph-volume',
'lvm', 'lvm',