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

Set default log_driver to None to prevent config comparison when a log_driver is not specified. Fixes #4600.

Browse source
This commit is contained in:
Chris Houseknecht 2016-09-10 01:31:36 -04:00 committed by Matt Clay
parent 05303a974d
commit e95f773d96
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -200,7 +200,7 @@ options:
required: false
log_driver:
description:
- Specify the logging driver.
- Specify the logging driver. Docker uses json-file by default.
choices:
- json-file
- syslog
@ -209,7 +209,7 @@ options:
- fluentd
- awslogs
- splunk
default: json-file
default: null
required: false
log_options:
description:
@ -1906,7 +1906,7 @@ def main():
kill_signal=dict(type='str'),
labels=dict(type='dict'),
links=dict(type='list'),
log_driver=dict(type='str', choices=['json-file', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs', 'splunk'], default='json-file'),
log_driver=dict(type='str', choices=['json-file', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs', 'splunk'], default=None),
log_options=dict(type='dict', aliases=['log_opt']),
mac_address=dict(type='str'),
memory=dict(type='str', default='0'),