From c91b94402b1bc17170eff4e7de6de314043a6cd0 Mon Sep 17 00:00:00 2001 From: Pavol Ipoth Date: Mon, 11 Apr 2016 20:18:14 +0200 Subject: [PATCH] Added pvs parameter to lvol module --- lib/ansible/modules/extras/system/lvol.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/extras/system/lvol.py b/lib/ansible/modules/extras/system/lvol.py index f80bf98850c..f6774596f0b 100644 --- a/lib/ansible/modules/extras/system/lvol.py +++ b/lib/ansible/modules/extras/system/lvol.py @@ -48,7 +48,7 @@ options: choices: [ "present", "absent" ] default: present description: - - Control if the logical volume exists. If C(present) the C(size) option + - Control if the logical volume exists. If C(present) the C(size) option is required. required: false force: @@ -76,6 +76,9 @@ EXAMPLES = ''' # Create a logical volume of 512m. - 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. - lvol: vg=firefly lv=test size=512g @@ -158,6 +161,7 @@ def main(): state=dict(choices=["absent", "present"], default='present'), force=dict(type='bool', default='no'), snapshot=dict(type='str', default=None), + pvs=dict(type='str') ), supports_check_mode=True, ) @@ -181,6 +185,12 @@ def main(): size_opt = 'L' size_unit = 'm' snapshot = module.params['snapshot'] + pvs = module.params['pvs'] + + if pvs is None: + pvs = "" + else: + pvs = pvs.replace(",", " ") if opts is None: opts = "" @@ -230,7 +240,7 @@ def main(): module.fail_json(msg="Volume group %s does not exist." % vg, rc=rc, err=err) vgs = parse_vgs(current_vgs) - this_vg = vgs[0] + this_vg = vgs[0] # Get information on logical volume requested lvs_cmd = module.get_bin_path("lvs", required=True) @@ -275,7 +285,7 @@ def main(): 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) 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) if rc == 0: changed = True @@ -306,7 +316,7 @@ def main(): if '+' in size: size_requested += this_lv['size'] if this_lv['size'] < size_requested: - if (size_free > 0) and (('+' not in size) or (size_free >= (size_requested - this_lv['size']))): + if (size_free > 0) and (('+' not in size) or (size_free >= (size_requested - this_lv['size']))): tool = module.get_bin_path("lvextend", required=True) else: module.fail_json(msg="Logical Volume %s could not be extended. Not enough free space left (%s%s required / %s%s available)" % (this_lv['name'], (size_requested - this_lv['size']), unit, size_free, unit)) @@ -323,7 +333,7 @@ def main(): if module.check_mode: changed = True 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) 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) @@ -353,7 +363,7 @@ def main(): if module.check_mode: changed = True 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) 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)