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

Use proper HostConfig element which contians the proper Memory value - fixes #1766

Browse source
This commit is contained in:
Micheal Waltz 2015-07-21 12:58:58 -07:00
parent 9e47219b96
commit b0b1566b89
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

@ -1008,7 +1008,7 @@ class DockerManager(object):
except ValueError as e: except ValueError as e:
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
actual_mem = container['Config']['Memory'] actual_mem = container['HostConfig']['Memory']
if expected_mem and actual_mem != expected_mem: if expected_mem and actual_mem != expected_mem:
self.reload_reasons.append('memory ({0} => {1})'.format(actual_mem, expected_mem)) self.reload_reasons.append('memory ({0} => {1})'.format(actual_mem, expected_mem))