From de0122fdaf5975cf2df87fc36b059c74032396e6 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chousekn@redhat.com>
Date: Sat, 10 Sep 2016 01:31:36 -0400
Subject: [PATCH] Set default log_driver to None to prevent config comparison
 when a log_driver is not specified. Fixes #4600.

---
 cloud/docker/docker_container.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py
index fa54dc63c03..b5e8313af89 100644
--- a/cloud/docker/docker_container.py
+++ b/cloud/docker/docker_container.py
@@ -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'),