From cfed617dba3c66d252cd25843ef5e3855f4c1edc Mon Sep 17 00:00:00 2001 From: Jun Guo Date: Tue, 24 Jan 2017 04:23:58 +0800 Subject: [PATCH] Support option none in docker_container when setting log_driver (#19040) Per official docker document, it support setting `--log-driver=none` to disable any logging for the container. So let's add it to this module. Fixes #5337 --- lib/ansible/modules/cloud/docker/docker_container.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py index 8eb4b36060f..b33b28d3abd 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -207,6 +207,7 @@ options: description: - Specify the logging driver. Docker uses json-file by default. choices: + - none - json-file - syslog - journald @@ -1961,7 +1962,9 @@ 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=None), + log_driver=dict(type='str', + choices=['none', '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'),