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

Merge branch 'discordianfish-docker-add-net-parameter' into devel

Browse source
This commit is contained in:
James Cammarata 2014-08-08 13:17:07 -05:00
commit 412c07e5ee
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cloud/docker
View file

@ -183,6 +183,13 @@ options:
default: false default: false
aliases: [] aliases: []
version_added: "1.6" version_added: "1.6"
net:
description:
- Set Network mode for the container (bridge, none, container:<name|id>, host). Requires docker >= 0.11.
required: false
default: false
aliases: []
version_added: "1.8"
author: Cove Schneider, Joshua Conner, Pavel Antonov author: Cove Schneider, Joshua Conner, Pavel Antonov
requirements: [ "docker-py >= 0.3.0", "docker >= 0.10.0" ] requirements: [ "docker-py >= 0.3.0", "docker >= 0.10.0" ]
''' '''
@ -293,6 +300,14 @@ Create containers with options specified as strings and lists as comma-separated
sudo: yes sudo: yes
tasks: tasks:
docker: image=namespace/image_name links=postgresql:db,redis:redis docker: image=namespace/image_name links=postgresql:db,redis:redis
Create a container with no networking:
- hosts: web
sudo: yes
tasks:
docker: image=namespace/image_name net=none
''' '''
HAS_DOCKER_PY = True HAS_DOCKER_PY = True
@ -597,6 +612,7 @@ class DockerManager:
'publish_all_ports': self.module.params.get('publish_all_ports'), 'publish_all_ports': self.module.params.get('publish_all_ports'),
'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'),
} }
if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0 and hasattr(docker, '__version__') and docker.__version__ > '0.3.0': if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0 and hasattr(docker, '__version__') and docker.__version__ > '0.3.0':
params['dns'] = self.module.params.get('dns') params['dns'] = self.module.params.get('dns')
@ -682,7 +698,8 @@ def main():
stdin_open = dict(default=False, type='bool'), stdin_open = dict(default=False, type='bool'),
tty = dict(default=False, type='bool'), tty = dict(default=False, type='bool'),
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)
) )
) )