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

Merge pull request #1767 from ecliptik/devel

Browse source 
Use proper HostConfig element which contains the proper Memory value …
This commit is contained in:
Brian Coca 2015-07-27 18:23:33 -04:00
commit 44d23ababd
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cloud/docker/docker.py
View file

@ -964,6 +964,9 @@ class DockerManager(object):
running = self.get_running_containers() running = self.get_running_containers()
current = self.get_inspect_containers(running) current = self.get_inspect_containers(running)
#Get API version
api_version = self.client.version()['ApiVersion']
image = self.get_inspect_image() image = self.get_inspect_image()
if image is None: if image is None:
# The image isn't present. Assume that we're about to pull a new # The image isn't present. Assume that we're about to pull a new
@ -1030,7 +1033,11 @@ 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'] #For v1.19 API and above use HostConfig, otherwise use Config
if docker_api_version >= 1.19:
actual_mem = container['HostConfig']['Memory']
else:
actual_mem = container['Config']['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))