From f5c1d8141befb48969da653bf5857c69b696ea83 Mon Sep 17 00:00:00 2001 From: Ryan Walls Date: Thu, 28 May 2015 11:36:20 -0600 Subject: [PATCH] Set default "log_driver" option to None in docker module. --- lib/ansible/modules/cloud/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index c060c83637..c5a187046d 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -102,6 +102,7 @@ options: "none" disables any logging for the container. docker logs won't be available with this driver. "syslog" Syslog logging driver for Docker. Writes log messages to syslog. docker logs command is not available for this logging driver. + If not defined explicitly, the Docker daemon's default ("json-file") will apply. Requires docker >= 1.6.0. required: false default: json-file @@ -1531,7 +1532,7 @@ def main(): net = dict(default=None), pid = dict(default=None), insecure_registry = dict(default=False, type='bool'), - log_driver = dict(default='json-file', choices=['json-file', 'none', 'syslog']), + log_driver = dict(default=None, choices=['json-file', 'none', 'syslog']), ), required_together = ( ['tls_client_cert', 'tls_client_key'],