Merge pull request #890 from SamYaple/docker-pid-support
Add pid mode support to docker module
This commit is contained in:
commit
1c0623ab8d
1 changed files with 9 additions and 0 deletions
|
@ -197,6 +197,13 @@ options:
|
|||
- or host. Requires docker >= 0.11.
|
||||
default: false
|
||||
version_added: "1.8"
|
||||
pid:
|
||||
description:
|
||||
- Set the PID namespace mode for the container (currently only supports 'host'). Requires docker-py >= 1.0.0 and docker >= 1.4.1.
|
||||
required: false
|
||||
default: None
|
||||
aliases: []
|
||||
version_added: "1.9"
|
||||
registry:
|
||||
description:
|
||||
- Remote registry URL to pull images from.
|
||||
|
@ -1139,6 +1146,7 @@ class DockerManager(object):
|
|||
'privileged': self.module.params.get('privileged'),
|
||||
'links': self.links,
|
||||
'network_mode': self.module.params.get('net'),
|
||||
'pid_mode': self.module.params.get('pid'),
|
||||
}
|
||||
|
||||
optionals = {}
|
||||
|
@ -1348,6 +1356,7 @@ def main():
|
|||
lxc_conf = dict(default=None, type='list'),
|
||||
name = dict(default=None),
|
||||
net = dict(default=None),
|
||||
pid = dict(default=None),
|
||||
insecure_registry = dict(default=False, type='bool'),
|
||||
)
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue