diff options
| author | Micheal Waltz <mwaltz@qualcomm.com> | 2015-07-21 12:58:58 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-08-06 09:50:38 -0700 |
| commit | 944aa1c4e54a9dbcf43776828ae283d2df634bec (patch) | |
| tree | d5f09dac2cec499dd7713bf0d13769eaeaddbf3c | |
| parent | 7463476f71796b5cd5b5a1566c4b21f31dbbfc7a (diff) | |
| download | ansible-modules-core-944aa1c4e54a9dbcf43776828ae283d2df634bec.tar.gz | |
Use proper HostConfig element which contians the proper Memory value - fixes #1766
Conflicts:
cloud/docker/docker.py
| -rw-r--r-- | cloud/docker/docker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index c2a0f209..2d6e669d 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -954,7 +954,7 @@ class DockerManager(object): # MEM_LIMIT expected_mem = _human_to_bytes(self.module.params.get('memory_limit')) - actual_mem = container['Config']['Memory'] + actual_mem = container['HostConfig']['Memory'] if expected_mem and actual_mem != expected_mem: self.reload_reasons.append('memory ({0} => {1})'.format(actual_mem, expected_mem)) |