summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Epifanov <ilya.epifanov@datravel.com>2015-08-16 18:34:56 +0300
committerToshio Kuratomi <toshio@fedoraproject.org>2015-08-20 09:48:45 -0700
commit35496dfe5f9bcbe0cd49e130860a8c74083edab3 (patch)
treed509b7eb8531a3b89ff787ff65e48d66a1c2f773
parentb907189e3c4aa3dcb2a85fb11c31dce2ac73b750 (diff)
downloadansible-modules-core-35496dfe5f9bcbe0cd49e130860a8c74083edab3.tar.gz
fixed memory_limit for docker api version >= 1.19
-rw-r--r--cloud/docker/docker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index f6aba9ab..d5dd95fa 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -1279,7 +1279,7 @@ class DockerManager(object):
if api_version < 1.19:
params['mem_limit'] = mem_limit
else:
- params['host_config']['mem_limit'] = mem_limit
+ params['host_config']['Memory'] = mem_limit
def do_create(count, params):