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

Add support for cpusets. Requires docker-py >= 0.6.0

Browse source
This commit is contained in:
Daniel Kerwin 2014-11-24 22:55:14 +01:00 committed by Matt Clay
parent 87c8d016dc
commit 940baa92a6
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -285,8 +285,14 @@ options:
docker-py >= 0.5.0. docker-py >= 0.5.0.
default: false default: false
version_added: "1.9" version_added: "1.9"
cpuset:
description:
- CPUs in which to allow execution. Requires docker-py >= 0.6.0.
required: false
default: null
version_added: "1.8"
author: author:
- "Cove Schneider (@cove)" - "Cove Schneider (@cove)"
- "Joshua Conner (@joshuaconner)" - "Joshua Conner (@joshuaconner)"
- "Pavel Antonov (@softzilla)" - "Pavel Antonov (@softzilla)"
@ -1610,6 +1616,7 @@ def main():
pid = dict(default=None), pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'), insecure_registry = dict(default=False, type='bool'),
log_driver = dict(default=None, choices=['json-file', 'none', 'syslog']), log_driver = dict(default=None, choices=['json-file', 'none', 'syslog']),
cpuset = dict(default=None),
), ),
required_together = ( required_together = (
['tls_client_cert', 'tls_client_key'], ['tls_client_cert', 'tls_client_key'],