Merge pull request #890 from SamYaple/docker-pid-support

Add pid mode support to docker module
reviewable/pr18780/r1
Brian Coca 11 years ago
commit 1c0623ab8d

@ -197,6 +197,13 @@ options:
- or host. Requires docker >= 0.11. - or host. Requires docker >= 0.11.
default: false default: false
version_added: "1.8" 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: registry:
description: description:
- Remote registry URL to pull images from. - Remote registry URL to pull images from.
@ -1139,6 +1146,7 @@ class DockerManager(object):
'privileged': self.module.params.get('privileged'), 'privileged': self.module.params.get('privileged'),
'links': self.links, 'links': self.links,
'network_mode': self.module.params.get('net'), 'network_mode': self.module.params.get('net'),
'pid_mode': self.module.params.get('pid'),
} }
optionals = {} optionals = {}
@ -1348,6 +1356,7 @@ def main():
lxc_conf = dict(default=None, type='list'), lxc_conf = dict(default=None, type='list'),
name = dict(default=None), name = dict(default=None),
net = dict(default=None), net = dict(default=None),
pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'), insecure_registry = dict(default=False, type='bool'),
) )
) )

Loading…
Cancel
Save