From fdc0711c1a7f57aaa0efc46d738a2d4035cbc1e0 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Tue, 4 Sep 2018 23:44:09 +0200
Subject: [PATCH] [2.6] docker_container: allow arbitrary log_driver  (#44563)

* docker_container: allow arbitrary log_driver (#33579)

Docker supports logging plugin (see https://docs.docker.com/engine/admin/logging/plugins)
so it no longer makes sense to limit the log_driver option to a set of
fixed choices.

* Changelog entry.
---
 .../33579-docker_container-log_driver.yaml      |  2 ++
 .../modules/cloud/docker/docker_container.py    | 17 ++++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 changelogs/fragments/33579-docker_container-log_driver.yaml

diff --git a/changelogs/fragments/33579-docker_container-log_driver.yaml b/changelogs/fragments/33579-docker_container-log_driver.yaml
new file mode 100644
index 00000000000..d428f2dc821
--- /dev/null
+++ b/changelogs/fragments/33579-docker_container-log_driver.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+- "Allow arbitrary ``log_driver`` for docker_container (https://github.com/ansible/ansible/pull/33579)."
diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py
index 54bf1e5b92b..254353f711b 100644
--- a/lib/ansible/modules/cloud/docker/docker_container.py
+++ b/lib/ansible/modules/cloud/docker/docker_container.py
@@ -175,16 +175,9 @@ options:
       - List of name aliases for linked containers in the format C(container_name:alias)
   log_driver:
     description:
-      - Specify the logging driver. Docker uses json-file by default.
-    choices:
-      - none
-      - json-file
-      - syslog
-      - journald
-      - gelf
-      - fluentd
-      - awslogs
-      - splunk
+      - Specify the logging driver. Docker uses I(json-file) by default.
+      - See L(here,https://docs.docker.com/config/containers/logging/configure/) for possible choices.
+    required: false
   log_options:
     description:
       - Dictionary of options specific to the chosen log_driver. See https://docs.docker.com/engine/admin/logging/overview/
@@ -2072,9 +2065,7 @@ def main():
         kill_signal=dict(type='str'),
         labels=dict(type='dict'),
         links=dict(type='list'),
-        log_driver=dict(type='str',
-                        choices=['none', 'json-file', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs', 'splunk'],
-                        default=None),
+        log_driver=dict(type='str'),
         log_options=dict(type='dict', aliases=['log_opt']),
         mac_address=dict(type='str'),
         memory=dict(type='str', default='0'),