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

Merge pull request #1830 from ecliptik/devel

Browse source 
Fix incorrect var name for api_version
This commit is contained in:
Brian Coca 2015-07-28 18:25:20 -04:00
commit 49400d90ac
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/docker/docker.py
View file

@ -1035,7 +1035,7 @@ class DockerManager(object):
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
#For v1.19 API and above use HostConfig, otherwise use Config #For v1.19 API and above use HostConfig, otherwise use Config
if docker_api_version >= 1.19: if api_version >= 1.19:
actual_mem = container['HostConfig']['Memory'] actual_mem = container['HostConfig']['Memory']
else: else:
actual_mem = container['Config']['Memory'] actual_mem = container['Config']['Memory']