cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow specifying human readable value for option memory_limit again (#4049)

Browse source
This commit is contained in:
PikachuEXE 2016-08-16 20:44:24 +08:00 committed by Matt Clay
parent 53a0a64bda
commit fc87dd9650
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/_docker.py
View file

@ -566,6 +566,8 @@ def _human_to_bytes(number):
if isinstance(number, int):
return number
if number.isdigit():
return int(number)
if number[-1] == suffixes[0] and number[-2].isdigit():
return number[:-1]
@ -1870,7 +1872,7 @@ def main():
volumes_from = dict(default=None, type='list'),
links = dict(default=None, type='list'),
devices = dict(default=None, type='list'),
memory_limit = dict(default=0, type='int'),
memory_limit = dict(default=0),
memory_swap = dict(default=0, type='int'),
cpu_shares = dict(default=0, type='int'),
docker_url = dict(),