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

Add version_added to documentation

Browse source
This commit is contained in:
Toshio Kuratomi 2015-12-18 16:33:48 -08:00
parent 8fe5d6f7ef
commit 581b4f6de6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cloud/docker/docker.py
View file

@ -100,6 +100,7 @@ options:
- List of host devices to expose to container - List of host devices to expose to container
default: null default: null
required: false required: false
version_added: "2.1"
log_driver: log_driver:
description: description:
- You can specify a different logging driver for the container than for the daemon. - You can specify a different logging driver for the container than for the daemon.
@ -391,7 +392,7 @@ EXAMPLES = '''
# stopped and removed, and a new one will be launched in its place. # stopped and removed, and a new one will be launched in its place.
# - link this container to the existing redis container launched above with # - link this container to the existing redis container launched above with
# an alias. # an alias.
# - grant the container read write permissions for the host's /dev/sda device # - grant the container read write permissions for the host's /dev/sda device
# through a node named /dev/xvda # through a node named /dev/xvda
# - bind TCP port 9000 within the container to port 8080 on all interfaces # - bind TCP port 9000 within the container to port 8080 on all interfaces
# on the host. # on the host.
@ -849,8 +850,8 @@ class DockerManager(object):
} }
optionals = {} optionals = {}
for optional_param in ('devices', 'dns', 'volumes_from', for optional_param in ('devices', 'dns', 'volumes_from',
'restart_policy', 'restart_policy_retry', 'pid', 'extra_hosts', 'restart_policy', 'restart_policy_retry', 'pid', 'extra_hosts',
'log_driver', 'cap_add', 'cap_drop', 'read_only', 'log_opt'): 'log_driver', 'cap_add', 'cap_drop', 'read_only', 'log_opt'):
optionals[optional_param] = self.module.params.get(optional_param) optionals[optional_param] = self.module.params.get(optional_param)
@ -1313,7 +1314,7 @@ class DockerManager(object):
differing.append(container) differing.append(container)
continue continue
# DEVICES # DEVICES
expected_devices = set() expected_devices = set()
for device in (self.module.params.get('devices') or []): for device in (self.module.params.get('devices') or []):