diff options
| author | Felix Fontein <felix@fontein.de> | 2020-12-07 23:58:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 16:58:42 -0600 |
| commit | 07cdb709aeaaaa4b0bf3769479952b4fa175d852 (patch) | |
| tree | 562e2aa209dc52a46616ec4a258dc97679882ed7 | |
| parent | ba25a1cdf1753ab6370748d330e1b99a833c9304 (diff) | |
| download | ansible-07cdb709aeaaaa4b0bf3769479952b4fa175d852.tar.gz | |
Adjust action groups to moved modules (#72428) (#72496)
* Support docker and k8s action groups for moved modules in community.docker and community.kubevirt.
* Also support k8s action group for community.okd.
* Also add kubernetes.core.
* Fix changelog fragment.
* Remove community.okd.
* Revert "Remove community.okd."
This reverts commit 812b5aa6e2bc2894db455fd5e2bcdcc9bd6fa3f8.
(cherry picked from commit c7a4b39633de482d555ae60b469ca3127acf7fb1)
| -rw-r--r-- | changelogs/fragments/72428-action-groups-docker-k8s.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/executor/module_common.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/changelogs/fragments/72428-action-groups-docker-k8s.yml b/changelogs/fragments/72428-action-groups-docker-k8s.yml new file mode 100644 index 0000000000..bde0a0d022 --- /dev/null +++ b/changelogs/fragments/72428-action-groups-docker-k8s.yml @@ -0,0 +1,2 @@ +bugfixes: +- "The ``docker`` and ``k8s`` action groups / module default groups now also support the moved modules in `community.docker <https://galaxy.ansible.com/community/docker>`_, `community.kubevirt <https://github.com/ansible-collections/community.kubevirt>`_, `community.okd <https://galaxy.ansible.com/community/okd>`_, and `kubernetes.core <https://galaxy.ansible.com/kubernetes/core>`_ (https://github.com/ansible/ansible/pull/72428)." diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index 61b89291e3..15f2506a75 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -1338,9 +1338,9 @@ def get_action_args_with_defaults(action, args, defaults, templar, redirected_na 'aws': ['amazon.aws', 'community.aws'], 'azure': ['azure.azcollection'], 'cpm': ['wti.remote'], - 'docker': ['community.general'], + 'docker': ['community.general', 'community.docker'], 'gcp': ['google.cloud'], - 'k8s': ['community.kubernetes', 'community.general'], + 'k8s': ['community.kubernetes', 'community.general', 'community.kubevirt', 'community.okd', 'kubernetes.core'], 'os': ['openstack.cloud'], 'ovirt': ['ovirt.ovirt', 'community.general'], 'vmware': ['community.vmware'], |