wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow floating point input for size vale

Browse source
This commit is contained in:
Charles Paul 2015-10-05 12:16:29 -05:00 committed by Matt Clay
parent 4134b7a04d
commit 0acfd95747
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/modules/extras/system/lvol.py
View file

@ -42,7 +42,8 @@ options:
- The size of the logical volume, according to lvcreate(8) --size, by - The size of the logical volume, according to lvcreate(8) --size, by
default in megabytes or optionally with one of [bBsSkKmMgGtTpPeE] units; or default in megabytes or optionally with one of [bBsSkKmMgGtTpPeE] units; or
according to lvcreate(8) --extents as a percentage of [VG|PVS|FREE]; according to lvcreate(8) --extents as a percentage of [VG|PVS|FREE];
resizing is not supported with percentages. resizing is not supported with percentages. Float values must begin
with a digit.
state: state:
choices: [ "present", "absent" ] choices: [ "present", "absent" ]
default: present default: present
@ -95,6 +96,7 @@ decimal_point = re.compile(r"(\.|,)")
def mkversion(major, minor, patch): def mkversion(major, minor, patch):
return (1000 * 1000 * int(major)) + (1000 * int(minor)) + int(patch) return (1000 * 1000 * int(major)) + (1000 * int(minor)) + int(patch)
def parse_lvs(data): def parse_lvs(data):
lvs = [] lvs = []
for line in data.splitlines(): for line in data.splitlines():
@ -122,7 +124,7 @@ def main():
argument_spec=dict( argument_spec=dict(
vg=dict(required=True), vg=dict(required=True),
lv=dict(required=True), lv=dict(required=True),
size=dict(), size=dict(type='str'),
opts=dict(type='str'), opts=dict(type='str'),
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'),
@ -167,23 +169,19 @@ def main():
size_opt = 'l' size_opt = 'l'
size_unit = '' size_unit = ''
if not '%' in size:
# LVCREATE(8) -L --size option unit # LVCREATE(8) -L --size option unit
elif size[-1].isalpha():
if size[-1].lower() in 'bskmgtpe': if size[-1].lower() in 'bskmgtpe':
size_unit = size[-1].lower() size_unit = size[-1].lower()
if size[0:-1].isdigit(): size = size[0:-1]
size = int(size[0:-1])
else:
module.fail_json(msg="Bad size specification for unit %s" % size_unit)
size_opt = 'L'
else:
module.fail_json(msg="Size unit should be one of [bBsSkKmMgGtTpPeE]")
# when no unit, megabytes by default
elif size.isdigit():
size = int(size)
else:
module.fail_json(msg="Bad size specification")
try:
float(size)
if not size[0].isdigit(): raise ValueError()
except ValueError:
module.fail_json(msg="Bad size specification of '%s'" % size)
# when no unit, megabytes by default
if size_opt == 'l': if size_opt == 'l':
unit = 'm' unit = 'm'
else: else: