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 Brian Coca
parent 45c1ae0ac1
commit 997fa3b2b7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/docker/_docker.py
View file

@ -562,6 +562,8 @@ def _human_to_bytes(number):
if isinstance(number, int): if isinstance(number, int):
return number return number
if number.isdigit():
return int(number)
if number[-1] == suffixes[0] and number[-2].isdigit(): if number[-1] == suffixes[0] and number[-2].isdigit():
return number[:-1] return number[:-1]
@ -1853,7 +1855,7 @@ def main():
volumes_from = dict(default=None, type='list'), volumes_from = dict(default=None, type='list'),
links = dict(default=None, type='list'), links = dict(default=None, type='list'),
devices = 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'), memory_swap = dict(default=0, type='int'),
cpu_shares = dict(default=0, type='int'), cpu_shares = dict(default=0, type='int'),
docker_url = dict(), docker_url = dict(),