Merge pull request #1 from p53/Issue#2003

Fixes #2003 Added pvs parameter to lvol module
reviewable/pr18780/r1
p53 9 years ago
commit ad12773056

@ -76,6 +76,9 @@ EXAMPLES = '''
# Create a logical volume of 512m. # Create a logical volume of 512m.
- lvol: vg=firefly lv=test size=512 - lvol: vg=firefly lv=test size=512
# Create a logical volume of 512m with disks /dev/sda and /dev/sdb
- lvol: vg=firefly lv=test size=512 pvs=/dev/sda,/dev/sdb
# Create a logical volume of 512g. # Create a logical volume of 512g.
- lvol: vg=firefly lv=test size=512g - lvol: vg=firefly lv=test size=512g
@ -158,6 +161,7 @@ def main():
state=dict(choices=["absent", "present"], default='present'), state=dict(choices=["absent", "present"], default='present'),
force=dict(type='bool', default='no'), force=dict(type='bool', default='no'),
snapshot=dict(type='str', default=None), snapshot=dict(type='str', default=None),
pvs=dict(type='str')
), ),
supports_check_mode=True, supports_check_mode=True,
) )
@ -181,6 +185,12 @@ def main():
size_opt = 'L' size_opt = 'L'
size_unit = 'm' size_unit = 'm'
snapshot = module.params['snapshot'] snapshot = module.params['snapshot']
pvs = module.params['pvs']
if pvs is None:
pvs = ""
else:
pvs = pvs.replace(",", " ")
if opts is None: if opts is None:
opts = "" opts = ""
@ -275,7 +285,7 @@ def main():
if snapshot is not None: if snapshot is not None:
cmd = "%s %s -%s %s%s -s -n %s %s %s/%s" % (lvcreate_cmd, yesopt, size_opt, size, size_unit, snapshot, opts, vg, lv) cmd = "%s %s -%s %s%s -s -n %s %s %s/%s" % (lvcreate_cmd, yesopt, size_opt, size, size_unit, snapshot, opts, vg, lv)
else: else:
cmd = "%s %s -n %s -%s %s%s %s %s" % (lvcreate_cmd, yesopt, lv, size_opt, size, size_unit, opts, vg) cmd = "%s %s -n %s -%s %s%s %s %s %s" % (lvcreate_cmd, yesopt, lv, size_opt, size, size_unit, opts, vg, pvs)
rc, _, err = module.run_command(cmd) rc, _, err = module.run_command(cmd)
if rc == 0: if rc == 0:
changed = True changed = True
@ -323,7 +333,7 @@ def main():
if module.check_mode: if module.check_mode:
changed = True changed = True
else: else:
cmd = "%s -%s %s%s %s/%s" % (tool, size_opt, size, size_unit, vg, this_lv['name']) cmd = "%s -%s %s%s %s/%s %s" % (tool, size_opt, size, size_unit, vg, this_lv['name'], pvs)
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if "Reached maximum COW size" in out: if "Reached maximum COW size" in out:
module.fail_json(msg="Unable to resize %s to %s%s" % (lv, size, size_unit), rc=rc, err=err, out=out) module.fail_json(msg="Unable to resize %s to %s%s" % (lv, size, size_unit), rc=rc, err=err, out=out)
@ -353,7 +363,7 @@ def main():
if module.check_mode: if module.check_mode:
changed = True changed = True
else: else:
cmd = "%s -%s %s%s %s/%s" % (tool, size_opt, size, size_unit, vg, this_lv['name']) cmd = "%s -%s %s%s %s/%s %s" % (tool, size_opt, size, size_unit, vg, this_lv['name'], pvs)
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if "Reached maximum COW size" in out: if "Reached maximum COW size" in out:
module.fail_json(msg="Unable to resize %s to %s%s" % (lv, size, size_unit), rc=rc, err=err, out=out) module.fail_json(msg="Unable to resize %s to %s%s" % (lv, size, size_unit), rc=rc, err=err, out=out)

Loading…
Cancel
Save