From c95717afe582ae889f781e44e58683b77657d1e9 Mon Sep 17 00:00:00 2001
From: Ryan Walls <ryan.walls@3dsim.com>
Date: Thu, 28 May 2015 11:36:20 -0600
Subject: [PATCH] Set default "log_driver" option to None in docker module.
---
cloud/docker/docker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index d765ce00c66..e22f8ff3edd 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -100,6 +100,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
@@ -1510,7 +1511,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'],