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

restore mem_limit

Browse source 
mem_limit got lost in the #1744; this restores it.  Thanks to @dgromov
for the report.
This commit is contained in:
Lars Kellogg-Stedman 2015-07-21 11:52:48 -04:00 committed by Matt Clay
parent 562341049e
commit 3d79d96a1b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker.py
View file

@ -1396,10 +1396,16 @@ class DockerManager(object):
return docker.utils.create_host_config(**params) return docker.utils.create_host_config(**params)
def create_containers(self, count=1): def create_containers(self, count=1):
try:
mem_limit = _human_to_bytes(self.module.params.get('memory_limit'))
except ValueError as e:
self.module.fail_json(msg=str(e))
params = {'image': self.module.params.get('image'), params = {'image': self.module.params.get('image'),
'command': self.module.params.get('command'), 'command': self.module.params.get('command'),
'ports': self.exposed_ports, 'ports': self.exposed_ports,
'volumes': self.volumes, 'volumes': self.volumes,
'mem_limit': mem_limit,
'environment': self.env, 'environment': self.env,
'hostname': self.module.params.get('hostname'), 'hostname': self.module.params.get('hostname'),
'domainname': self.module.params.get('domainname'), 'domainname': self.module.params.get('domainname'),