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

Switch to _cap_ver_req and add cpu_set to create_containers

Browse source
This commit is contained in:
Daniel Kerwin 2015-06-29 22:15:25 +02:00 committed by Matt Clay
parent 861d260b6c
commit 3a68101fa3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -555,6 +555,7 @@ class DockerManager(object):
'pid': ((1, 0, 0), '1.17'), 'pid': ((1, 0, 0), '1.17'),
'log_driver': ((1, 2, 0), '1.18'), 'log_driver': ((1, 2, 0), '1.18'),
'host_config': ((0, 7, 0), '1.15'), 'host_config': ((0, 7, 0), '1.15'),
'cpu_set': ((0, 6, 0), '1.14'),
# Clientside only # Clientside only
'insecure_registry': ((0, 5, 0), '0.0') 'insecure_registry': ((0, 5, 0), '0.0')
} }
@ -577,7 +578,7 @@ class DockerManager(object):
elif 2 <= len(parts) <= 3: elif 2 <= len(parts) <= 3:
# default to read-write # default to read-write
ro = False ro = False
# with supplied bind mode # with supplied bind mode
if len(parts) == 3: if len(parts) == 3:
if parts[2] not in ['ro', 'rw']: if parts[2] not in ['ro', 'rw']:
self.module.fail_json(msg='bind mode needs to either be "ro" or "rw"') self.module.fail_json(msg='bind mode needs to either be "ro" or "rw"')
@ -1376,6 +1377,7 @@ class DockerManager(object):
'tty': self.module.params.get('tty'), 'tty': self.module.params.get('tty'),
'volumes_from': self.module.params.get('volumes_from'), 'volumes_from': self.module.params.get('volumes_from'),
'dns': self.module.params.get('dns'), 'dns': self.module.params.get('dns'),
'cpuset': self.module.params.get('cpu_set'),
'host_config': self.create_host_config(), 'host_config': self.create_host_config(),
'user': self.module.params.get('docker_user'), 'user': self.module.params.get('docker_user'),
} }