From aa04e61c89af5f4e67ed9d52df91e642df4d242f Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 9 Oct 2019 21:12:02 +0200
Subject: [PATCH] docker_* modules: add docker module defaults group (#63164)

* Add docker module defaults group.
* Add footnote about docker_stack not being included (instead of remarks column)
---
 .../user_guide/playbooks_module_defaults.rst  | 42 ++++++++++--------
 lib/ansible/config/module_defaults.yml        | 44 +++++++++++++++++++
 2 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/docs/docsite/rst/user_guide/playbooks_module_defaults.rst b/docs/docsite/rst/user_guide/playbooks_module_defaults.rst
index c5c24cc3dab..e7a8832a8f8 100644
--- a/docs/docsite/rst/user_guide/playbooks_module_defaults.rst
+++ b/docs/docsite/rst/user_guide/playbooks_module_defaults.rst
@@ -85,25 +85,29 @@ Module defaults groups
 Ansible 2.7 adds a preview-status feature to group together modules that share common sets of parameters. This makes
 it easier to author playbooks making heavy use of API-based modules such as cloud modules.
 
-+--------+---------------------------+-----------------+
-| Group  | Purpose                   | Ansible Version |
-+========+===========================+=================+
-| aws    | Amazon Web Services       | 2.7             |
-+--------+---------------------------+-----------------+
-| azure  | Azure                     | 2.7             |
-+--------+---------------------------+-----------------+
-| gcp    | Google Cloud Platform     | 2.7             |
-+--------+---------------------------+-----------------+
-| k8s    | Kubernetes                | 2.8             |
-+--------+---------------------------+-----------------+
-| os     | OpenStack                 | 2.8             |
-+--------+---------------------------+-----------------+
-| acme   | ACME                      | 2.10            |
-+--------+---------------------------+-----------------+
-| vmware | VMware                    | 2.10            |
-+--------+---------------------------+-----------------+
-
-Use the groups with `module_defaults` by prefixing the group name with `group/` - e.g. `group/aws`
++---------+---------------------------+-----------------+
+| Group   | Purpose                   | Ansible Version |
++=========+===========================+=================+
+| aws     | Amazon Web Services       | 2.7             |
++---------+---------------------------+-----------------+
+| azure   | Azure                     | 2.7             |
++---------+---------------------------+-----------------+
+| gcp     | Google Cloud Platform     | 2.7             |
++---------+---------------------------+-----------------+
+| k8s     | Kubernetes                | 2.8             |
++---------+---------------------------+-----------------+
+| os      | OpenStack                 | 2.8             |
++---------+---------------------------+-----------------+
+| acme    | ACME                      | 2.10            |
++---------+---------------------------+-----------------+
+| docker* | Docker                    | 2.10            |
++---------+---------------------------+-----------------+
+| vmware  | VMware                    | 2.10            |
++---------+---------------------------+-----------------+
+
+* The `docker_stack <docker_stack_module>`_ module is not included in the ``docker`` defaults group.
+
+Use the groups with ``module_defaults`` by prefixing the group name with ``group/`` - e.g. ``group/aws``.
 
 In a playbook, you can set module defaults for whole groups of modules, such as setting a common AWS region.
 
diff --git a/lib/ansible/config/module_defaults.yml b/lib/ansible/config/module_defaults.yml
index 19d53090f63..9d41783a1b8 100644
--- a/lib/ansible/config/module_defaults.yml
+++ b/lib/ansible/config/module_defaults.yml
@@ -155,6 +155,50 @@ groupings:
   - aws
   dms_replication_subnet_group:
   - aws
+  docker_compose:
+  - docker
+  docker_config:
+  - docker
+  docker_container_info:
+  - docker
+  docker_container:
+  - docker
+  docker_host_info:
+  - docker
+  docker_image_facts:
+  - docker
+  docker_image_info:
+  - docker
+  docker_image:
+  - docker
+  docker_login:
+  - docker
+  docker_network_info:
+  - docker
+  docker_network:
+  - docker
+  docker_node_info:
+  - docker
+  docker_node:
+  - docker
+  docker_prune:
+  - docker
+  docker_secret:
+  - docker
+  docker_service:
+  - docker
+  docker_swarm_info:
+  - docker
+  docker_swarm:
+  - docker
+  docker_swarm_service_info:
+  - docker
+  docker_swarm_service:
+  - docker
+  docker_volume_info:
+  - docker
+  docker_volume:
+  - docker
   dynamodb_table:
   - aws
   dynamodb_ttl: