Add changelog for 1.0.0.

Add release summary.
Wildfly didn't start because of some permission problems. (#718 )
2026-04-29 09:56:53 +00:00 · 2020-07-31 13:54:10 +02:00 · 2020-07-31 13:52:28 +02:00 · 2020-07-31 13:47:38 +02:00 · 2020-07-31 10:57:57 +02:00 · 2020-07-31 10:56:12 +02:00
1167 changed files with 11141 additions and 28868 deletions
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -64,18 +64,10 @@ files:
  $doc_fragments/hwc.py:
    maintainers: $team_huawei
    labels: hwc
-  $doc_fragments/mysql.py:
-    maintainers: $team_mysql
-    labels: database mysql
-    keywords: mariadb proxysql
  $doc_fragments/postgres.py:
    maintainers: $team_postgresql
    labels: postgres postgresql
    keywords: database postgres postgresql
-  $doc_fragments/proxysql.py:
-    maintainers: $team_mysql
-    labels: database mysql proxysql
-    keywords: mariadb proxysql
  $doc_fragments/xenserver.py:
    maintainers: bvitnik
    labels: xenserver
@@ -159,10 +151,6 @@ files:
  $module_utils/memset.py:
    maintainers: glitchcrab
    labels: cloud memset
-  $module_utils/mysql.py:
-    maintainers: $team_mysql
-    labels: database mysql
-    keywords: mariadb proxysql
  $module_utils/net_tools/nios/api.py:
    maintainers: $team_networking sganesh-infoblox
    labels: infoblox networking
@@ -200,33 +188,6 @@ files:
    authors: krsacme
  $modules/cloud/centurylink/:
    authors: clc-runner
-  $modules/cloud/digital_ocean/digital_ocean.py:
-    authors: zbal
-  $modules/cloud/digital_ocean/:
-    authors: Akasurde
-    maintainers: $team_digital_ocean
-    keywords:
-      - digital ocean
-      - droplet
-  $modules/cloud/digital_ocean/digital_ocean_firewall_facts.py:
-    authors: BondAnthony
-    maintainers: mgregson
-  $modules/cloud/digital_ocean/digital_ocean_floating_ip_facts.py:
-    authors: pmarques
-  $modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py:
-    authors: pmarques
-  $modules/cloud/digital_ocean/digital_ocean_block_storage.py:
-    authors: harneksidhu
-  $modules/cloud/digital_ocean/digital_ocean_domain.py:
-    authors: mgregson
-    maintainers: BondAnthony
-  $modules/cloud/digital_ocean/digital_ocean_droplet.py:
-    authors: gurch101
-  $modules/cloud/digital_ocean/digital_ocean_firewall_info.py:
-    authors: BondAnthony
-    maintainers: mgregson
-  $modules/cloud/digital_ocean/digital_ocean_tag.py:
-    authors: kontrafiktion
  $modules/cloud/dimensiondata/dimensiondata_network.py:
    authors: aimonb
    maintainers: tintoy
@@ -457,12 +418,12 @@ files:
    authors: Spredzy sieben
  $modules/cloud/smartos/smartos_image_facts.py:
    authors: xen0l
-    maintainers: bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
+    maintainers: bcoca fishman jasperla jpdasma mator scathatheworm troy2914
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/cloud/smartos/imgadm.py:
    authors: jasperla
-    maintainers: bcoca danowar2k fishman jpdasma mator scathatheworm troy2914 xen0l
+    maintainers: bcoca fishman jpdasma mator scathatheworm troy2914 xen0l
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/cloud/smartos/nictagadm.py:
@@ -472,12 +433,12 @@ files:
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/cloud/smartos/smartos_image_info.py:
    authors: xen0l
-    maintainers: bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
+    maintainers: bcoca fishman jasperla jpdasma mator scathatheworm troy2914
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/cloud/smartos/vmadm.py:
    authors: jasperla
-    maintainers: bcoca danowar2k fishman jpdasma mator scathatheworm troy2914 xen0l
+    maintainers: bcoca fishman jpdasma mator scathatheworm troy2914 xen0l
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/cloud/softlayer/sl_vm.py:
@@ -529,22 +490,6 @@ files:
    authors: vedit
    maintainers: Jmainguy kenichi-ogawa-1988
    labels: mssql_db
-  $modules/database/mysql/mysql_db.py:
-    authors: ansible
-    maintainers: $team_mysql
-  $modules/database/mysql/:
-    authors: Andersson007
-    maintainers: Alexander198961 Xyon bmalynovytch bmildren kurtdavis michaelcoburn oneiroi tolland
-    keywords: mariadb proxysql
-  $modules/database/mysql/mysql_replication.py:
-    authors: Andersson007 banyek
-  $modules/database/mysql/mysql_user.py:
-    authors: Jmainguy bmalynovytch
-    maintainers: Alexander198961 Andersson007 Xyon bmildren kurtdavis michaelcoburn oneiroi tolland
-    ignore: tomaszkiewicz
-  $modules/database/mysql/mysql_variables.py:
-    authors: banyek
-    maintainers: $team_mysql
  $modules/database/postgresql/postgresql_db.py:
    authors: ansible
    maintainers: $team_postgresql
@@ -583,11 +528,6 @@ files:
  $modules/database/postgresql/postgresql_user.py:
    authors: ansible
    maintainers: $team_postgresql
-  $modules/database/proxysql/:
-    authors: bmildren
-    maintainers: Alexander198961 Andersson007 Xyon bmalynovytch kurtdavis michaelcoburn oneiroi tolland
-    labels: mysql
-    keywords: mariadb proxysql
  $modules/database/vertica/:
    authors: dareko
  $modules/files/archive.py:
@@ -665,10 +605,6 @@ files:
    authors: ivanvanderbyl
    labels: logentries
    ignore: ivanvanderbyl
-  $modules/monitoring/:
-    authors: ethanculler woz5999
-    labels: logicmonitor
-    ignore: ethanculler woz5999
  $modules/monitoring/logstash_plugin.py:
    authors: nerzhul
  $modules/monitoring/monit.py:
@@ -939,7 +875,7 @@ files:
    ignore: elasticdog
  $modules/packaging/os/pkgin.py:
    authors: L2G jasperla szinck
-    maintainers: bcoca danowar2k fishman jpdasma mator scathatheworm troy2914 xen0l
+    maintainers: bcoca fishman jpdasma mator scathatheworm troy2914 xen0l
    labels: pkgin solaris
  $modules/packaging/os/pkgng.py:
    authors: bleader
@@ -1052,7 +988,7 @@ files:
    authors: fgbulsoni
  $modules/remote_management/redfish/:
    authors: jose-delarosa
-    maintainers: billdodd mraineri tomasg2012
+    maintainers: $team_redfish
  $modules/remote_management/stacki/stacki_host.py:
    authors: bbyhuy
    maintainers: bsanders
@@ -1136,7 +1072,7 @@ files:
    maintainers: $team_solaris
  $modules/storage/zfs/:
    authors: xen0l
-    maintainers: bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
+    maintainers: bcoca fishman jasperla jpdasma mator scathatheworm troy2914
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/system/python_requirements_facts.py:
@@ -1161,7 +1097,7 @@ files:
    authors: tdtrask
  $modules/system/beadm.py:
    authors: xen0l
-    maintainers: bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
+    maintainers: bcoca fishman jasperla jpdasma mator scathatheworm troy2914
    labels: beadm solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/system/capabilities.py:
@@ -1179,8 +1115,6 @@ files:
    authors: abulimov
    maintainers: pilou-
    labels: filesystem
-  $modules/system/firewalld.py:
-    authors: maxamillion
  $modules/system/gconftool2.py:
    authors: kevensen
    maintainers: Akasurde
@@ -1368,7 +1302,6 @@ macros:
  team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister mator molekuul ramooncamacho wtcross
  team_bsd: JoergFiedler MacLemon bcoca dch jasperla mekanix opoplawski overhacked tuxillo
  team_cyberark_conjur: jvanderhoof ryanprior
-  team_digital_ocean: BondAnthony mgregson
  team_docker: DBendit WojciechowskiPiotr akshay196 danihodovic dariko felixfontein jwitko kassiansun tbouvet
  team_e_spirit: MatrixCrawler getjack
  team_extreme: LindsayHill bigmstone ujwalkomarla
@@ -1382,7 +1315,6 @@ macros:
  team_linode: InTheCloudDan decentral1se displague rmcintosh
  team_macos: akasurde kyleabenson martinm82
  team_manageiq: abellotti cben gtanzillo yaacov zgalor
-  team_mysql: Alexander198961 Andersson007 Xyon bmalynovytch bmildren kurtdavis michaelcoburn oneiroi tolland
  team_netapp: amit0701 carchi8py hulquest lmprice lonico ndswartz schmots1
  team_netscaler: chiradeep giorgos-nikolopoulos
  team_netvisor: Qalthos amitsi csharpe-pn pdam preetiparasar
@@ -1391,9 +1323,9 @@ macros:
  team_postgresql: Andersson007 Dorn- amenonsen andytom jbscalia kostiantyn-nemchenko matburt nerzhul sebasmannem tcraxs
  team_purestorage: bannaych dnix101 genegr lionmax opslounge raekins sdodsley sile16
  team_rabbitmq: chrishoffman manuel-sousa
-  team_redfish: billdodd jose-delarosa mraineri tomasg2012
+  team_redfish: billdodd mraineri tomasg2012
  team_rhn: FlossWare alikins barnabycourt vritant
  team_scaleway: DenBeke QuentinBrosse abarbare jerome-quere kindermoumoute remyleone
-  team_solaris: bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
+  team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
  team_suse: commel dcermak evrardjp lrupp toabctl
  team_virt: joshainglis karmab
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,49 @@
+name: "Code scanning - action"
+
+on:
+  schedule:
+    - cron: '26 19 * * 1'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,13 +5,132 @@ Community General Release Notes
 .. contents:: Topics


-v0.2.1
+v1.0.0
 ======

 Release Summary
 ---------------

-Maintenance release where the ``master`` branch was renamed to ``main``. Contains no other change.
+This is release 1.0.0 of ``community.general``, released on 2020-07-31.
+
+
+Minor Changes
+-------------
+
+- Add the ``gcpubsub``, ``gcpubsub_info`` and ``gcpubsub_facts`` (to be removed in 3.0.0) modules. These were originally in community.general, but removed on the assumption that they have been moved to google.cloud. Since this turned out to be incorrect, we re-added them for 1.0.0.
+- Add the deprecated ``gcp_backend_service``, ``gcp_forwarding_rule`` and ``gcp_healthcheck`` modules, which will be removed in 2.0.0. These were originally in community.general, but removed on the assumption that they have been moved to google.cloud. Since this turned out to be incorrect, we re-added them for 1.0.0.
+- The collection is now actively tested in CI with the latest Ansible 2.9 release.
+- airbrake_deployment - add ``version`` param; clarified docs on ``revision`` param (https://github.com/ansible-collections/community.general/pull/583).
+- apk - added ``no_cache`` option (https://github.com/ansible-collections/community.general/pull/548).
+- firewalld - the module has been moved to the ``ansible.posix`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/623).
+- gitlab_project - add support for merge_method on projects (https://github.com/ansible/ansible/pull/66813).
+- gitlab_runners inventory plugin - permit environment variable input for ``server_url``, ``api_token`` and ``filter`` options (https://github.com/ansible-collections/community.general/pull/611).
+- haproxy - add options to dis/enable health and agent checks.  When health and agent checks are enabled for a service, a disabled service will re-enable itself automatically.  These options also change the state of the agent checks to match the requested state for the backend (https://github.com/ansible-collections/community.general/issues/684).
+- log_plays callback - use v2 methods (https://github.com/ansible-collections/community.general/pull/442).
+- logstash callback - add ini config (https://github.com/ansible-collections/community.general/pull/610).
+- lxd_container - added support of ``--target`` flag for cluster deployments (https://github.com/ansible-collections/community.general/issues/637).
+- parted - accept negative numbers in ``part_start`` and ``part_end``
+- pkgng - added ``stdout`` and ``stderr`` attributes to the result (https://github.com/ansible-collections/community.general/pull/560).
+- pkgng - added support for upgrading all packages using ``name: *, state: latest``, similar to other package providers (https://github.com/ansible-collections/community.general/pull/569).
+- postgresql_query - add search_path parameter (https://github.com/ansible-collections/community.general/issues/625).
+- rundeck_acl_policy - add check for rundeck_acl_policy name parameter (https://github.com/ansible-collections/community.general/pull/612).
+- slack - add support for sending messages built with block kit (https://github.com/ansible-collections/community.general/issues/380).
+- splunk callback - add an option to allow not to validate certificate from HEC (https://github.com/ansible-collections/community.general/pull/596).
+- xfconf - add arrays support (https://github.com/ansible/ansible/issues/46308).
+- xfconf - add support for ``uint`` type (https://github.com/ansible-collections/community.general/pull/696).
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- log_plays callback - add missing information to the logs generated by the callback plugin. This changes the log message format (https://github.com/ansible-collections/community.general/pull/442).
+- pkgng - passing ``name: *`` with ``state: absent`` will no longer remove every installed package from the system. It is now a noop. (https://github.com/ansible-collections/community.general/pull/569).
+- pkgng - passing ``name: *`` with ``state: latest`` or ``state: present`` will no longer install every package from the configured package repositories. Instead, ``name: *, state: latest`` will upgrade all already-installed packages, and ``name: *, state: present`` is a noop. (https://github.com/ansible-collections/community.general/pull/569).
+
+Deprecated Features
+-------------------
+
+- The ldap_attr module has been deprecated and will be removed in a later release; use ldap_attrs instead.
+- xbps - the ``force`` option never had any effect. It is now deprecated, and will be removed in 3.0.0 (https://github.com/ansible-collections/community.general/pull/568).
+
+Removed Features (previously deprecated)
+----------------------------------------
+
+- conjur_variable lookup - has been moved to the ``cyberark.conjur`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/570).
+- digital_ocean_* - all DigitalOcean modules have been moved to the ``community.digitalocean`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/622).
+- infini_* - all infinidat modules have been moved to the ``infinidat.infinibox`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/607).
+- logicmonitor - the module has been removed in 1.0.0 since it is unmaintained and the API used by the module has been turned off in 2017 (https://github.com/ansible-collections/community.general/issues/539, https://github.com/ansible-collections/community.general/pull/541).
+- logicmonitor_facts - the module has been removed in 1.0.0 since it is unmaintained and the API used by the module has been turned off in 2017 (https://github.com/ansible-collections/community.general/issues/539, https://github.com/ansible-collections/community.general/pull/541).
+- mysql_* - all MySQL modules have been moved to the ``community.mysql`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/633).
+- proxysql_* - all ProxySQL modules have been moved to the ``community.proxysql`` collection. A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/624).
+
+Bugfixes
+--------
+
+- aix_filesystem - fix issues with ismount module_util pathing for Ansible 2.9 (https://github.com/ansible-collections/community.general/pull/567).
+- consul_kv lookup - fix ``ANSIBLE_CONSUL_URL`` environment variable handling (https://github.com/ansible/ansible/issues/51960).
+- consul_kv lookup - fix arguments handling (https://github.com/ansible-collections/community.general/pull/303).
+- digital_ocean_tag_info - fix crash when querying for an individual tag (https://github.com/ansible-collections/community.general/pull/615).
+- doas become plugin - address a bug with the parameters handling that was breaking the plugin in community.general when ``become_flags`` and ``become_user`` were not explicitly specified (https://github.com/ansible-collections/community.general/pull/704).
+- docker_compose - add a condition to prevent service startup if parameter ``stopped`` is true. Otherwise, the service will be started on each play and stopped again immediately due to the ``stopped`` parameter and breaks the idempotency of the module (https://github.com/ansible-collections/community.general/issues/532).
+- docker_compose - disallow usage of the parameters ``stopped`` and ``restarted`` at the same time. This breaks also the idempotency (https://github.com/ansible-collections/community.general/issues/532).
+- docker_container - use Config MacAddress by default instead of Networks. Networks MacAddress is empty in some cases (https://github.com/ansible/ansible/issues/70206).
+- docker_container - various error fixes in string handling for Python 2 to avoid crashes when non-ASCII characters are used in strings (https://github.com/ansible-collections/community.general/issues/640).
+- docker_swarm - removes ``advertise_addr`` from list of required arguments when ``state`` is ``"join"`` (https://github.com/ansible-collections/community.general/issues/439).
+- dzdo become plugin - address a bug with the parameters handling that was breaking the plugin in community.general when ``become_user`` was not explicitly specified (https://github.com/ansible-collections/community.general/pull/708).
+- filesystem - resizefs of xfs filesystems is fixed. Filesystem needs to be mounted.
+- jenkins_plugin - replace MD5 checksum verification with SHA1 due to MD5 being disabled on systems with FIPS-only algorithms enabled (https://github.com/ansible/ansible/issues/34304).
+- jira - improve error message handling (https://github.com/ansible-collections/community.general/pull/311).
+- jira - improve error message handling with multiple errors (https://github.com/ansible-collections/community.general/pull/707).
+- kubevirt - Add aliases 'interface_name' for network_name (https://github.com/ansible/ansible/issues/55641).
+- nmcli - fix idempotetency when modifying an existing connection (https://github.com/ansible-collections/community.general/issues/481).
+- osx_defaults - fix handling negative integers (https://github.com/ansible-collections/community.general/issues/134).
+- pacman - treat package names containing .zst as package files during installation (https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/, https://github.com/ansible-collections/community.general/pull/650).
+- pbrun become plugin - address a bug with the parameters handling that was breaking the plugin in community.general when ``become_user`` was not explicitly specified (https://github.com/ansible-collections/community.general/pull/708).
+- postgresql_privs - fix crash when set privileges on schema with hyphen in the name (https://github.com/ansible-collections/community.general/issues/656).
+- postgresql_set - only display a warning about restarts, when restarting is needed (https://github.com/ansible-collections/community.general/pull/651).
+- redfish_info, redfish_config, redfish_command - Fix Redfish response payload decode on Python 3.5 (https://github.com/ansible-collections/community.general/issues/686)
+- selective - mark task failed correctly (https://github.com/ansible/ansible/issues/63767).
+- snmp_facts - skip ``EndOfMibView`` values (https://github.com/ansible/ansible/issues/49044).
+- yarn - fixed an index out of range error when no outdated packages where returned by yarn executable (see https://github.com/ansible-collections/community.general/pull/474).
+- yarn - fixed an too many values to unpack error when scoped packages are installed (see https://github.com/ansible-collections/community.general/pull/474).
+
+New Plugins
+-----------
+
+Inventory
+~~~~~~~~~
+
+- cobbler - Cobbler inventory source
+
+Lookup
+~~~~~~
+
+- dsv - Get secrets from Thycotic DevOps Secrets Vault
+- tss - Get secrets from Thycotic Secret Server
+
+New Modules
+-----------
+
+Cloud
+~~~~~
+
+docker
+^^^^^^
+
+- docker_stack_info - Return information on a docker stack
+
+Database
+~~~~~~~~
+
+misc
+^^^^
+
+- odbc - Execute SQL via ODBC
+
+System
+~~~~~~
+
+- launchd - Manage macOS services

 v0.2.0
 ======
--- a/README.md
+++ b/README.md
@@ -2,14 +2,21 @@

 [![Run Status](https://api.shippable.com/projects/5e664a167c32620006c9fa50/badge?branch=main)](https://app.shippable.com/github/ansible-collections/community.general/dashboard) [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)

-This repo contains the `community.general` Ansible Collection.
+This repo contains the `community.general` Ansible Collection. The collection includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.

-The collection includes the modules and plugins supported by Ansible community.
+## Tested with Ansible

+Tested with the current Ansible 2.9 and 2.10 releases and the current development version of Ansible. Ansible versions before 2.9.10 are not supported.

-## Installation and Usage
+## External requirements

-### Installing the Collection from Ansible Galaxy
+Some modules and plugins require external libraries. Please check the requirements for each plugin or module you use in the documentation to find out which requirements are needed.
+
+## Included content
+
+Please check the included content on the [Ansible Galaxy page for this collection](https://galaxy.ansible.com/community/general).
+
+## Using this collection

 Before using the General community collection, you need to install the collection with the `ansible-galaxy` CLI:

@@ -22,34 +29,19 @@ collections:
 - name: community.general
 ```

-## Testing and Development
+See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.

-If you want to develop new content for this collection or improve what is already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
+## Contributing to this collection

-You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections)
+If you want to develop new content for this collection or improve what is already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATH`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.

-### Testing with `ansible-test`
+You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible Community Guide](https://docs.ansible.com/ansible/latest/community/index.html).
+
+### Running tests

 See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).

-## Release notes
-
-See [here](https://github.com/ansible-collections/community.general/tree/main/CHANGELOG.rst).
-
-## Publishing New Version
-
-Basic instructions without release branches:
-
-1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
-2. Run `antsibull-changelog release --collection-flatmap yes`
-3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
-4. Tag the commit with `<version>`. Push changes and tag to the main repository.
-
-## More Information
-
-TBD
-
-## Communication
+### Communication

 We have a dedicated Working Group for Ansible development.

@@ -62,8 +54,34 @@ For more information about communities, meetings and agendas see [Community Wiki

 For more information about [communication](https://docs.ansible.com/ansible/latest/community/communication.html)

-## License
+### Publishing New Version

-GNU General Public License v3.0 or later
+Basic instructions without release branches:

-See [LICENSE](COPYING) to see the full text.
+1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
+2. Run `antsibull-changelog release --collection-flatmap yes`
+3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
+4. Tag the commit with `<version>`. Push changes and tag to the main repository.
+
+## Release notes
+
+See the [changelog](https://github.com/ansible-collections/community.general/blob/main/CHANGELOG.rst).
+
+## Roadmap
+
+See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning and deprecation.
+
+In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
+
+## More information
+
+- [Ansible Collection overview](https://github.com/ansible-collections/overview)
+- [Ansible User guide](https://docs.ansible.com/ansible/latest/user_guide/index.html)
+- [Ansible Developer guide](https://docs.ansible.com/ansible/latest/dev_guide/index.html)
+- [Ansible Community code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)
+
+## Licensing
+
+GNU General Public License v3.0 or later.
+
+See [COPYING](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -905,10 +905,208 @@ releases:
        name: lmdb_kv
        namespace: null
    release_date: '2020-06-20'
-  0.2.1:
+  1.0.0:
    changes:
-      release_summary: Maintenance release where the ``master`` branch was renamed
-        to ``main``. Contains no other change.
+      breaking_changes:
+      - log_plays callback - add missing information to the logs generated by the
+        callback plugin. This changes the log message format (https://github.com/ansible-collections/community.general/pull/442).
+      - 'pkgng - passing ``name: *`` with ``state: absent`` will no longer remove
+        every installed package from the system. It is now a noop. (https://github.com/ansible-collections/community.general/pull/569).'
+      - 'pkgng - passing ``name: *`` with ``state: latest`` or ``state: present``
+        will no longer install every package from the configured package repositories.
+        Instead, ``name: *, state: latest`` will upgrade all already-installed packages,
+        and ``name: *, state: present`` is a noop. (https://github.com/ansible-collections/community.general/pull/569).'
+      bugfixes:
+      - aix_filesystem - fix issues with ismount module_util pathing for Ansible 2.9
+        (https://github.com/ansible-collections/community.general/pull/567).
+      - consul_kv lookup - fix ``ANSIBLE_CONSUL_URL`` environment variable handling
+        (https://github.com/ansible/ansible/issues/51960).
+      - consul_kv lookup - fix arguments handling (https://github.com/ansible-collections/community.general/pull/303).
+      - digital_ocean_tag_info - fix crash when querying for an individual tag (https://github.com/ansible-collections/community.general/pull/615).
+      - doas become plugin - address a bug with the parameters handling that was breaking
+        the plugin in community.general when ``become_flags`` and ``become_user``
+        were not explicitly specified (https://github.com/ansible-collections/community.general/pull/704).
+      - docker_compose - add a condition to prevent service startup if parameter ``stopped``
+        is true. Otherwise, the service will be started on each play and stopped again
+        immediately due to the ``stopped`` parameter and breaks the idempotency of
+        the module (https://github.com/ansible-collections/community.general/issues/532).
+      - docker_compose - disallow usage of the parameters ``stopped`` and ``restarted``
+        at the same time. This breaks also the idempotency (https://github.com/ansible-collections/community.general/issues/532).
+      - docker_container - use Config MacAddress by default instead of Networks. Networks
+        MacAddress is empty in some cases (https://github.com/ansible/ansible/issues/70206).
+      - docker_container - various error fixes in string handling for Python 2 to
+        avoid crashes when non-ASCII characters are used in strings (https://github.com/ansible-collections/community.general/issues/640).
+      - docker_swarm - removes ``advertise_addr`` from list of required arguments
+        when ``state`` is ``"join"`` (https://github.com/ansible-collections/community.general/issues/439).
+      - dzdo become plugin - address a bug with the parameters handling that was breaking
+        the plugin in community.general when ``become_user`` was not explicitly specified
+        (https://github.com/ansible-collections/community.general/pull/708).
+      - filesystem - resizefs of xfs filesystems is fixed. Filesystem needs to be
+        mounted.
+      - jenkins_plugin - replace MD5 checksum verification with SHA1 due to MD5 being
+        disabled on systems with FIPS-only algorithms enabled (https://github.com/ansible/ansible/issues/34304).
+      - jira - improve error message handling (https://github.com/ansible-collections/community.general/pull/311).
+      - jira - improve error message handling with multiple errors (https://github.com/ansible-collections/community.general/pull/707).
+      - kubevirt - Add aliases 'interface_name' for network_name (https://github.com/ansible/ansible/issues/55641).
+      - nmcli - fix idempotetency when modifying an existing connection (https://github.com/ansible-collections/community.general/issues/481).
+      - osx_defaults - fix handling negative integers (https://github.com/ansible-collections/community.general/issues/134).
+      - pacman - treat package names containing .zst as package files during installation
+        (https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/,
+        https://github.com/ansible-collections/community.general/pull/650).
+      - pbrun become plugin - address a bug with the parameters handling that was
+        breaking the plugin in community.general when ``become_user`` was not explicitly
+        specified (https://github.com/ansible-collections/community.general/pull/708).
+      - postgresql_privs - fix crash when set privileges on schema with hyphen in
+        the name (https://github.com/ansible-collections/community.general/issues/656).
+      - postgresql_set - only display a warning about restarts, when restarting is
+        needed (https://github.com/ansible-collections/community.general/pull/651).
+      - redfish_info, redfish_config, redfish_command - Fix Redfish response payload
+        decode on Python 3.5 (https://github.com/ansible-collections/community.general/issues/686)
+      - selective - mark task failed correctly (https://github.com/ansible/ansible/issues/63767).
+      - snmp_facts - skip ``EndOfMibView`` values (https://github.com/ansible/ansible/issues/49044).
+      - yarn - fixed an index out of range error when no outdated packages where returned
+        by yarn executable (see https://github.com/ansible-collections/community.general/pull/474).
+      - yarn - fixed an too many values to unpack error when scoped packages are installed
+        (see https://github.com/ansible-collections/community.general/pull/474).
+      deprecated_features:
+      - The ldap_attr module has been deprecated and will be removed in a later release;
+        use ldap_attrs instead.
+      - xbps - the ``force`` option never had any effect. It is now deprecated, and
+        will be removed in 3.0.0 (https://github.com/ansible-collections/community.general/pull/568).
+      minor_changes:
+      - Add the ``gcpubsub``, ``gcpubsub_info`` and ``gcpubsub_facts`` (to be removed
+        in 3.0.0) modules. These were originally in community.general, but removed
+        on the assumption that they have been moved to google.cloud. Since this turned
+        out to be incorrect, we re-added them for 1.0.0.
+      - Add the deprecated ``gcp_backend_service``, ``gcp_forwarding_rule`` and ``gcp_healthcheck``
+        modules, which will be removed in 2.0.0. These were originally in community.general,
+        but removed on the assumption that they have been moved to google.cloud. Since
+        this turned out to be incorrect, we re-added them for 1.0.0.
+      - The collection is now actively tested in CI with the latest Ansible 2.9 release.
+      - airbrake_deployment - add ``version`` param; clarified docs on ``revision``
+        param (https://github.com/ansible-collections/community.general/pull/583).
+      - apk - added ``no_cache`` option (https://github.com/ansible-collections/community.general/pull/548).
+      - firewalld - the module has been moved to the ``ansible.posix`` collection.
+        A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/623).
+      - gitlab_project - add support for merge_method on projects (https://github.com/ansible/ansible/pull/66813).
+      - gitlab_runners inventory plugin - permit environment variable input for ``server_url``,
+        ``api_token`` and ``filter`` options (https://github.com/ansible-collections/community.general/pull/611).
+      - haproxy - add options to dis/enable health and agent checks.  When health
+        and agent checks are enabled for a service, a disabled service will re-enable
+        itself automatically.  These options also change the state of the agent checks
+        to match the requested state for the backend (https://github.com/ansible-collections/community.general/issues/684).
+      - log_plays callback - use v2 methods (https://github.com/ansible-collections/community.general/pull/442).
+      - logstash callback - add ini config (https://github.com/ansible-collections/community.general/pull/610).
+      - lxd_container - added support of ``--target`` flag for cluster deployments
+        (https://github.com/ansible-collections/community.general/issues/637).
+      - parted - accept negative numbers in ``part_start`` and ``part_end``
+      - pkgng - added ``stdout`` and ``stderr`` attributes to the result (https://github.com/ansible-collections/community.general/pull/560).
+      - 'pkgng - added support for upgrading all packages using ``name: *, state:
+        latest``, similar to other package providers (https://github.com/ansible-collections/community.general/pull/569).'
+      - postgresql_query - add search_path parameter (https://github.com/ansible-collections/community.general/issues/625).
+      - rundeck_acl_policy - add check for rundeck_acl_policy name parameter (https://github.com/ansible-collections/community.general/pull/612).
+      - slack - add support for sending messages built with block kit (https://github.com/ansible-collections/community.general/issues/380).
+      - splunk callback - add an option to allow not to validate certificate from
+        HEC (https://github.com/ansible-collections/community.general/pull/596).
+      - xfconf - add arrays support (https://github.com/ansible/ansible/issues/46308).
+      - xfconf - add support for ``uint`` type (https://github.com/ansible-collections/community.general/pull/696).
+      release_summary: 'This is release 1.0.0 of ``community.general``, released on
+        2020-07-31.
+
+        '
+      removed_features:
+      - conjur_variable lookup - has been moved to the ``cyberark.conjur`` collection.
+        A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/570).
+      - digital_ocean_* - all DigitalOcean modules have been moved to the ``community.digitalocean``
+        collection. A redirection is active, which will be removed in version 2.0.0
+        (https://github.com/ansible-collections/community.general/pull/622).
+      - infini_* - all infinidat modules have been moved to the ``infinidat.infinibox``
+        collection. A redirection is active, which will be removed in version 2.0.0
+        (https://github.com/ansible-collections/community.general/pull/607).
+      - logicmonitor - the module has been removed in 1.0.0 since it is unmaintained
+        and the API used by the module has been turned off in 2017 (https://github.com/ansible-collections/community.general/issues/539,
+        https://github.com/ansible-collections/community.general/pull/541).
+      - logicmonitor_facts - the module has been removed in 1.0.0 since it is unmaintained
+        and the API used by the module has been turned off in 2017 (https://github.com/ansible-collections/community.general/issues/539,
+        https://github.com/ansible-collections/community.general/pull/541).
+      - mysql_* - all MySQL modules have been moved to the ``community.mysql`` collection.
+        A redirection is active, which will be removed in version 2.0.0 (https://github.com/ansible-collections/community.general/pull/633).
+      - proxysql_* - all ProxySQL modules have been moved to the ``community.proxysql``
+        collection. A redirection is active, which will be removed in version 2.0.0
+        (https://github.com/ansible-collections/community.general/pull/624).
    fragments:
-    - 0.2.1.yml
-    release_date: '2020-07-06'
+    - 1.0.0.yml
+    - 296-ansible-2.9.yml
+    - 303-consul_kv-fix-env-variables-handling.yaml
+    - 311-jira-error-handling.yaml
+    - 33979-xfs_growfs.yml
+    - 442-log_plays-add_playbook_task_name_and_action.yml
+    - 474-yarn_fix-outdated-fix-list.yml
+    - 547-start-service-condition.yaml
+    - 548_apk.yml
+    - 55903_kubevirt.yml
+    - 560-pkgng-add-stdout-and-stderr.yaml
+    - 562-nmcli-fix-idempotency.yaml
+    - 564-docker_container_use_config_macaddress_by_default.yaml
+    - 568_packaging.yml
+    - 569-pkgng-add-upgrade-action.yaml
+    - 596-splunk-add-option-to-not-validate-cert.yaml
+    - 610_logstash_callback_add_ini_config.yml
+    - 611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml
+    - 613-snmp_facts-EndOfMibView.yml
+    - 615-digital-ocean-tag-info-bugfix.yml
+    - 63767_selective.yml
+    - 642-docker_container-python-2.yml
+    - 646-docker_swarm-remove-advertise_addr-from-join-requirement.yaml
+    - 650_pacman_support_zst_package_files.yaml
+    - 651-fix-postgresql_set-warning.yaml
+    - 653-postgresql_query_add_search_path_param.yml
+    - 656-name-with-hyphen.yml
+    - 66813_gitlab_project.yml
+    - 676-osx_defaults_fix_handling_negative_ints.yml
+    - 677-jenkins_plugins_sha1.yaml
+    - 687-fix-redfish-payload-decode-python35.yml
+    - 689-haproxy_agent_and_health.yml
+    - 693-big-revamp-on-xfconf-adding-array-values.yml
+    - 702-slack-support-for-blocks.yaml
+    - 704-doas-set-correct-default-values.yml
+    - 707-jira-error-handling.yaml
+    - 708-set-correct-default-values.yml
+    - 711-lxd-target.yml
+    - add_argument_check_for_rundeck.yaml
+    - airbrake_deployment_add_version.yml
+    - aix_filesystem-module_util-routing-issue.yml
+    - cyberarkconjur-removal.yml
+    - digital-ocean.yml
+    - firewalld_migration.yml
+    - google-modules.yml
+    - infinidat-removal.yml
+    - logicmonitor-removal.yml
+    - mysql.yml
+    - parted_negative_numbers.yml
+    - porting-guide-2.yml
+    - proxysql.yml
+    - xfconf_add_uint_type.yml
+    modules:
+    - description: Return information on a docker stack
+      name: docker_stack_info
+      namespace: cloud.docker
+    - description: Manage macOS services
+      name: launchd
+      namespace: system
+    - description: Execute SQL via ODBC
+      name: odbc
+      namespace: database.misc
+    plugins:
+      inventory:
+      - description: Cobbler inventory source
+        name: cobbler
+        namespace: null
+      lookup:
+      - description: Get secrets from Thycotic DevOps Secrets Vault
+        name: dsv
+        namespace: null
+      - description: Get secrets from Thycotic Secret Server
+        name: tss
+        namespace: null
+    release_date: '2020-07-31'
--- a/changelogs/config.yaml
+++ b/changelogs/config.yaml
@@ -4,6 +4,7 @@ changes_file: changelog.yaml
 changes_format: combined
 keep_fragments: false
 mention_ancestor: true
+flatmap: true
 new_plugins_after_name: removed_features
 notesdir: fragments
 prelude_section_name: release_summary
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: general
-version: 0.2.1
+version: 1.0.0
 readme: README.md
 authors:
  - Ansible (https://github.com/ansible)
@@ -9,10 +9,10 @@ license_file: COPYING
 tags: null
 # NOTE: No more dependencies can be added to this list
 dependencies:
-  ansible.netcommon: '>=0.0.2'
-  ansible.posix: '>=0.1.0'
-  community.kubernetes: '>=0.1.0'
-  google.cloud: '>=0.0.9'
+  ansible.netcommon: '>=1.0.0'
+  ansible.posix: '>=1.0.0'
+  community.kubernetes: '>=0.11.1'  # check https://galaxy.ansible.com/community/kubernetes
+  google.cloud: '>=0.10.1'  # check https://galaxy.ansible.com/google/cloud
 repository: https://github.com/ansible-collections/community.general
 #documentation: https://github.com/ansible-collection-migration/community.general/tree/main/docs
 homepage: https://github.com/ansible-collections/community.general
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -56,8 +56,13 @@ action_groups:
  - ovirt_user_facts
  - ovirt_vm_facts
  - ovirt_vmpool_facts
-
 plugin_routing:
+  lookup:
+    conjur_variable:
+      redirect: cyberark.conjur.conjur_variable
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The conjur_variable lookup has been moved to the cyberark.conjur collection.
  modules:
    ali_instance_facts:
      deprecation:
@@ -66,59 +71,173 @@ plugin_routing:
    digital_ocean:
      deprecation:
        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
+        warning_text: The digital_ocean module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean
    digital_ocean_account_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_account_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_account_facts
+    digital_ocean_account_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_account_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_account_info
+    digital_ocean_block_storage:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_block_storage module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_block_storage
+    digital_ocean_certificate:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_certificate module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_certificate
    digital_ocean_certificate_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_certificate_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_certificate_facts
+    digital_ocean_certificate_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_certificate_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_certificate_info
+    digital_ocean_domain:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_domain module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_domain
    digital_ocean_domain_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_domain_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_domain_facts
+    digital_ocean_domain_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_domain_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_domain_info
+    digital_ocean_droplet:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_droplet module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_droplet
    digital_ocean_firewall_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_firewall_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_firewall_facts
+    digital_ocean_firewall_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_firewall_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_firewall_info
+    digital_ocean_floating_ip:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_floating_ip module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_floating_ip
    digital_ocean_floating_ip_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_floating_ip_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_floating_ip_facts
+    digital_ocean_floating_ip_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_floating_ip_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_floating_ip_info
    digital_ocean_image_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_image_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_image_facts
+    digital_ocean_image_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_image_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_image_info
    digital_ocean_load_balancer_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_load_balancer_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_load_balancer_facts
+    digital_ocean_load_balancer_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_load_balancer_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_load_balancer_info
    digital_ocean_region_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_region_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_region_facts
+    digital_ocean_region_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_region_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_region_info
    digital_ocean_size_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_size_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_size_facts
+    digital_ocean_size_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_size_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_size_info
    digital_ocean_snapshot_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_snapshot_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_snapshot_facts
+    digital_ocean_snapshot_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_snapshot_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_snapshot_info
+    digital_ocean_sshkey:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_sshkey module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_sshkey
    digital_ocean_sshkey_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_sshkey_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_sshkey_facts
+    digital_ocean_sshkey_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_sshkey_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_sshkey_info
+    digital_ocean_tag:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_tag module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_tag
    digital_ocean_tag_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_tag_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_tag_facts
+    digital_ocean_tag_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_tag_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_tag_info
    digital_ocean_volume_facts:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_volume_facts module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_volume_facts
+    digital_ocean_volume_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean_volume_info module has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean_volume_info
    docker_image_facts:
      deprecation:
        removal_version: 2.0.0
@@ -127,6 +246,15 @@ plugin_routing:
      deprecation:
        removal_version: 2.0.0
        warning_text: see plugin documentation for details
+    firewalld:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The firewalld module has been moved to the ansible.posix collection.
+      redirect: ansible.posix.firewalld
+    foreman:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
    gcdns_record:
      deprecation:
        removal_version: 2.0.0
@@ -139,6 +267,18 @@ plugin_routing:
      deprecation:
        removal_version: 2.0.0
        warning_text: see plugin documentation for details
+    gcp_backend_service:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    gcp_forwarding_rule:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    gcp_healthcheck:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
    gcp_target_proxy:
      deprecation:
        removal_version: 2.0.0
@@ -155,10 +295,72 @@ plugin_routing:
      deprecation:
        removal_version: 2.0.0
        warning_text: see plugin documentation for details
+    github_hooks:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
    helm:
      deprecation:
        removal_version: 3.0.0
        warning_text: The helm module in community.general has been deprecated. Use community.kubernetes.helm instead.
+    hpilo_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    idrac_redfish_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    infini_export:
+      redirect: infinidat.infinibox.infini_export
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_export module has been moved to the infinidat collection.
+    infini_export_client:
+      redirect: infinidat.infinibox.infini_export_client
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_export_client module has been moved to the infinidat collection.
+    infini_fs:
+      redirect: infinidat.infinibox.infini_fs
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_fs module has been moved to the infinidat collection.
+    infini_host:
+      redirect: infinidat.infinibox.infini_host
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_host module has been moved to the infinidat collection.
+    infini_pool:
+      redirect: infinidat.infinibox.infini_pool
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_pool module has been moved to the infinidat collection.
+    infini_vol:
+      redirect: infinidat.infinibox.infini_vol
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infini_vol module has been moved to the infinidat collection.
+    jenkins_job_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    katello:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    ldap_attr:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    logicmonitor:
+      tombstone:
+        removal_version: 1.0.0
+        warning_text: The logicmonitor_facts module is no longer maintained and the API used has been disabled in 2017.
+    logicmonitor_facts:
+      tombstone:
+        removal_version: 1.0.0
+        warning_text: The logicmonitor_facts module is no longer maintained and the API used has been disabled in 2017.
    memset_memstore_facts:
      deprecation:
        removal_version: 3.0.0
@@ -167,7 +369,113 @@ plugin_routing:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    ovirt:
+    mysql_db:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_db module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_db
+    mysql_info:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_info module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_info
+    mysql_query:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_query module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_query
+    mysql_replication:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_replication module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_replication
+    mysql_user:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_user module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_user
+    mysql_variables:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql_variables module has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql_variables
+    na_cdot_aggregate:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_license:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_lun:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_qtree:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_svm:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_user:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_user_role:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_cdot_volume:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: see plugin documentation for details
+    na_ontap_gather_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    nginx_status_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    one_image_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    onepassword_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_datacenter_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_enclosure_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_ethernet_network_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_fc_network_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_fcoe_network_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_logical_interconnect_group_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_network_set_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    oneview_san_manager_facts:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
@@ -179,7 +487,7 @@ plugin_routing:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    one_image_facts:
+    ovirt:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
@@ -279,6 +587,57 @@ plugin_routing:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
+    proxysql_backend_servers:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_backend_servers module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_backend_servers
+    proxysql_global_variables:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_global_variables module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_global_variables
+    proxysql_manage_config:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_manage_config module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_manage_config
+    proxysql_mysql_users:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_mysql_users module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_mysql_users
+    proxysql_query_rules:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_query_rules module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_query_rules
+    proxysql_replication_hostgroups:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_replication_hostgroups module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_replication_hostgroups
+    proxysql_scheduler:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql_scheduler module has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql_scheduler
+    purefa_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    purefb_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    python_requirements_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
+    redfish_facts:
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
    scaleway_image_facts:
      deprecation:
        removal_version: 3.0.0
@@ -307,118 +666,6 @@ plugin_routing:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    smartos_image_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    xenserver_guest_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    vertica_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    onepassword_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    ldap_attr:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    foreman:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    katello:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    hpilo_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_datacenter_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_enclosure_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_ethernet_network_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_fc_network_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_fcoe_network_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_logical_interconnect_group_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_network_set_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    oneview_san_manager_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    idrac_redfish_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    redfish_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    github_hooks:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_aggregate:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_license:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_lun:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_qtree:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_svm:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_user:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_user_role:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_cdot_volume:
-      deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    na_ontap_gather_facts:
-      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
    sf_account_manager:
      deprecation:
        removal_version: 2.0.0
@@ -439,23 +686,57 @@ plugin_routing:
      deprecation:
        removal_version: 2.0.0
        warning_text: see plugin documentation for details
-    purefa_facts:
+    smartos_image_facts:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    purefb_facts:
+    vertica_facts:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    python_requirements_facts:
+    xenserver_guest_facts:
      deprecation:
        removal_version: 3.0.0
        warning_text: see plugin documentation for details
-    jenkins_job_facts:
+  doc_fragments:
+    digital_ocean:
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
-    nginx_status_facts:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean docs_fragment has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean
+    infinibox:
+      redirect: infinidat.infinibox.infinibox
      deprecation:
-        removal_version: 3.0.0
-        warning_text: see plugin documentation for details
+        removal_version: 2.0.0
+        warning_text: The infinibox doc_fragments plugin has been moved to the infinidat.infinibox collection.
+    mysql:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql docs_fragment has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql
+    proxysql:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The proxysql docs_fragment has been moved to the community.proxysql collection.
+      redirect: community.proxysql.proxysql
+  module_utils:
+    digital_ocean:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The digital_ocean module_utils has been moved to the community.digitalocean collection.
+      redirect: community.digitalocean.digital_ocean
+    firewalld:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The firewalld module_utils has been moved to the ansible.posix collection.
+      redirect: ansible.posix.firewalld
+    infinibox:
+      redirect: infinidat.infinibox.infinibox
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The infinibox module_utils plugin has been moved to the infinidat.infinibox collection.
+    mysql:
+      deprecation:
+        removal_version: 2.0.0
+        warning_text: The mysql module_utils has been moved to the community.mysql collection.
+      redirect: community.mysql.mysql
--- a/plugins/become/doas.py
+++ b/plugins/become/doas.py
@@ -40,7 +40,7 @@ DOCUMENTATION = '''
              - name: ANSIBLE_DOAS_EXE
        become_flags:
            description: Options to pass to doas
-            default:
+            default: ''
            ini:
              - section: privilege_escalation
                key: become_flags
@@ -117,9 +117,8 @@ class BecomeModule(BecomeBase):
        if not self.get_option('become_pass') and '-n' not in flags:
            flags += ' -n'

-        user = self.get_option('become_user')
-        if user:
-            user = '-u %s' % (user)
+        become_user = self.get_option('become_user')
+        user = '-u %s' % (become_user) if become_user else ''

        success_cmd = self._build_success_command(cmd, shell, noexe=True)
        executable = getattr(shell, 'executable', shell.SHELL_FAMILY)
--- a/plugins/become/dzdo.py
+++ b/plugins/become/dzdo.py
@@ -89,8 +89,7 @@ class BecomeModule(BecomeBase):
            self.prompt = '[dzdo via ansible, key=%s] password:' % self._id
            flags = '%s -p "%s"' % (flags.replace('-n', ''), self.prompt)

-        user = self.get_option('become_user')
-        if user:
-            user = '-u %s' % (user)
+        become_user = self.get_option('become_user')
+        user = '-u %s' % (become_user) if become_user else ''

        return ' '.join([becomecmd, flags, user, self._build_success_command(cmd, shell)])
--- a/plugins/become/ksu.py
+++ b/plugins/become/ksu.py
@@ -13,7 +13,6 @@ DOCUMENTATION = '''
    options:
        become_user:
            description: User you 'become' to execute the task
-            default: ''
            ini:
              - section: privilege_escalation
                key: become_user
--- a/plugins/become/pbrun.py
+++ b/plugins/become/pbrun.py
@@ -97,9 +97,8 @@ class BecomeModule(BecomeBase):
        become_exe = self.get_option('become_exe')

        flags = self.get_option('become_flags')
-        user = self.get_option('become_user')
-        if user:
-            user = '-u %s' % (user)
+        become_user = self.get_option('become_user')
+        user = '-u %s' % (become_user) if become_user else ''
        noexe = not self.get_option('wrap_exe')

        return ' '.join([become_exe, flags, user, self._build_success_command(cmd, shell, noexe=noexe)])
--- a/plugins/callback/diy.py
+++ b/plugins/callback/diy.py
@@ -629,7 +629,7 @@ playbook.yml: >
    gather_facts: no
    tasks:
      - name:  Default plugin output
-        debug:
+        ansible.builtin.debug:
          msg: default plugin output

  - name: Override from play vars
@@ -687,11 +687,11 @@ playbook.yml: >

    tasks:
      - name: Custom banner with default plugin result output
-        debug:
+        ansible.builtin.debug:
          msg: "default plugin output: result example"

      - name: Override from task vars
-        debug:
+        ansible.builtin.debug:
          msg: "example {{ two }}"
        changed_when: true
        vars:
@@ -703,14 +703,14 @@ playbook.yml: >
          ansible_callback_diy_runner_on_ok_msg_color: "{{ 'yellow' if ansible_callback_diy.result.is_changed else 'bright green' }}"

      - name: Suppress output
-        debug:
+        ansible.builtin.debug:
          msg: i should not be displayed
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: ""
          ansible_callback_diy_runner_on_ok_msg: ""

      - name: Using alias vars (see ansible.cfg)
-        debug:
+        ansible.builtin.debug:
          msg:
        when: False
        vars:
@@ -719,13 +719,13 @@ playbook.yml: >
          on_skipped_msg_color: white

      - name: Just stdout
-        command: echo some stdout
+        ansible.builtin.command: echo some stdout
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: "\n"
          ansible_callback_diy_runner_on_ok_msg: "{{ ansible_callback_diy.result.output.stdout }}\n"

      - name: Multiline output
-        debug:
+        ansible.builtin.debug:
          msg: "{{ multiline }}"
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: "\nDIY output(via task vars): task example: {{ ansible_callback_diy.task.name }}"
@@ -738,7 +738,7 @@ playbook.yml: >
          ansible_callback_diy_playbook_on_task_start_msg_color: bright blue

      - name: Indentation
-        debug:
+        ansible.builtin.debug:
          msg: "{{ item.msg }}"
        with_items:
          - { indent: 1, msg: one., color: red }
@@ -751,14 +751,14 @@ playbook.yml: >
          ansible_callback_diy_runner_on_ok_msg_color: bright green

      - name: Using lookup and template as file
-        shell: "echo {% raw %}'output from {{ file_name }}'{% endraw %} > {{ file_name }}"
+        ansible.builtin.shell: "echo {% raw %}'output from {{ file_name }}'{% endraw %} > {{ file_name }}"
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: "\nDIY output(via task vars): task example: {{ ansible_callback_diy.task.name }}"
          file_name: diy_file_template_example
          ansible_callback_diy_runner_on_ok_msg: "{{ lookup('template', file_name) }}"

      - name: 'Look at top level vars available to the "runner_on_ok" callback'
-        debug:
+        ansible.builtin.debug:
          msg: ''
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: "\nDIY output(via task vars): task example: {{ ansible_callback_diy.task.name }}"
@@ -771,7 +771,7 @@ playbook.yml: >
          ansible_callback_diy_runner_on_ok_msg_color: white

      - name: 'Look at event data available to the "runner_on_ok" callback'
-        debug:
+        ansible.builtin.debug:
          msg: ''
        vars:
          ansible_callback_diy_playbook_on_task_start_msg: "\nDIY output(via task vars): task example: {{ ansible_callback_diy.task.name }}"
--- a/plugins/callback/log_plays.py
+++ b/plugins/callback/log_plays.py
@@ -53,7 +53,7 @@ class CallbackModule(CallbackBase):
    CALLBACK_NEEDS_WHITELIST = True

    TIME_FORMAT = "%b %d %Y %H:%M:%S"
-    MSG_FORMAT = "%(now)s - %(category)s - %(data)s\n\n"
+    MSG_FORMAT = "%(now)s - %(playbook)s - %(task_name)s - %(task_action)s - %(category)s - %(data)s\n\n"

    def __init__(self):

@@ -67,7 +67,8 @@ class CallbackModule(CallbackBase):
        if not os.path.exists(self.log_folder):
            makedirs_safe(self.log_folder)

-    def log(self, host, category, data):
+    def log(self, result, category):
+        data = result._result
        if isinstance(data, MutableMapping):
            if '_ansible_verbose_override' in data:
                # avoid logging extraneous data
@@ -79,30 +80,43 @@ class CallbackModule(CallbackBase):
                if invocation is not None:
                    data = json.dumps(invocation) + " => %s " % data

-        path = os.path.join(self.log_folder, host)
+        path = os.path.join(self.log_folder, result._host.get_name())
        now = time.strftime(self.TIME_FORMAT, time.localtime())

-        msg = to_bytes(self.MSG_FORMAT % dict(now=now, category=category, data=data))
+        msg = to_bytes(
+            self.MSG_FORMAT
+            % dict(
+                now=now,
+                playbook=self.playbook,
+                task_name=result._task.name,
+                task_action=result._task.action,
+                category=category,
+                data=data,
+            )
+        )
        with open(path, "ab") as fd:
            fd.write(msg)

-    def runner_on_failed(self, host, res, ignore_errors=False):
-        self.log(host, 'FAILED', res)
+    def v2_runner_on_failed(self, result, ignore_errors=False):
+        self.log(result, 'FAILED')

-    def runner_on_ok(self, host, res):
-        self.log(host, 'OK', res)
+    def v2_runner_on_ok(self, result):
+        self.log(result, 'OK')

-    def runner_on_skipped(self, host, item=None):
-        self.log(host, 'SKIPPED', '...')
+    def v2_runner_on_skipped(self, result):
+        self.log(result, 'SKIPPED')

-    def runner_on_unreachable(self, host, res):
-        self.log(host, 'UNREACHABLE', res)
+    def v2_runner_on_unreachable(self, result):
+        self.log(result, 'UNREACHABLE')

-    def runner_on_async_failed(self, host, res, jid):
-        self.log(host, 'ASYNC_FAILED', res)
+    def v2_runner_on_async_failed(self, result):
+        self.log(result, 'ASYNC_FAILED')

-    def playbook_on_import_for_host(self, host, imported_file):
-        self.log(host, 'IMPORTED', imported_file)
+    def v2_playbook_on_start(self, playbook):
+        self.playbook = playbook._file_name

-    def playbook_on_not_import_for_host(self, host, missing_file):
-        self.log(host, 'NOTIMPORTED', missing_file)
+    def v2_playbook_on_import_for_host(self, result, imported_file):
+        self.log(result, 'IMPORTED', imported_file)
+
+    def v2_playbook_on_not_import_for_host(self, result, missing_file):
+        self.log(result, 'NOTIMPORTED', missing_file)
--- a/plugins/callback/logstash.py
+++ b/plugins/callback/logstash.py
@@ -19,16 +19,28 @@ DOCUMENTATION = '''
        description: Address of the Logstash server
        env:
          - name: LOGSTASH_SERVER
+        ini:
+          - section: callback_logstash
+            key: server
+            version_added: 1.0.0
        default: localhost
      port:
        description: Port on which logstash is listening
        env:
            - name: LOGSTASH_PORT
+        ini:
+          - section: callback_logstash
+            key: port
+            version_added: 1.0.0
        default: 5000
      type:
        description: Message type
        env:
          - name: LOGSTASH_TYPE
+        ini:
+          - section: callback_logstash
+            key: type
+            version_added: 1.0.0
        default: ansible
 '''

@@ -68,7 +80,7 @@ class CallbackModule(CallbackBase):
    Requires:
        python-logstash

-    This plugin makes use of the following environment variables:
+    This plugin makes use of the following environment variables or ini config:
        LOGSTASH_SERVER   (optional): defaults to localhost
        LOGSTASH_PORT     (optional): defaults to 5000
        LOGSTASH_TYPE     (optional): defaults to ansible
@@ -79,30 +91,37 @@ class CallbackModule(CallbackBase):
    CALLBACK_NAME = 'community.general.logstash'
    CALLBACK_NEEDS_WHITELIST = True

-    def __init__(self):
-        super(CallbackModule, self).__init__()
+    def __init__(self, display=None):
+        super(CallbackModule, self).__init__(display=display)

        if not HAS_LOGSTASH:
            self.disabled = True
            self._display.warning("The required python-logstash is not installed. "
                                  "pip install python-logstash")
-        else:
-            self.logger = logging.getLogger('python-logstash-logger')
-            self.logger.setLevel(logging.DEBUG)

-            self.handler = logstash.TCPLogstashHandler(
-                os.getenv('LOGSTASH_SERVER', 'localhost'),
-                int(os.getenv('LOGSTASH_PORT', 5000)),
-                version=1,
-                message_type=os.getenv('LOGSTASH_TYPE', 'ansible')
-            )
-
-            self.logger.addHandler(self.handler)
-            self.hostname = socket.gethostname()
-            self.session = str(uuid.uuid1())
-            self.errors = 0
        self.start_time = datetime.utcnow()

+    def set_options(self, task_keys=None, var_options=None, direct=None):
+
+        super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
+
+        self.logger = logging.getLogger('python-logstash-logger')
+        self.logger.setLevel(logging.DEBUG)
+
+        self.logstash_server = self.get_option('server')
+        self.logstash_port = self.get_option('port')
+        self.logstash_type = self.get_option('type')
+        self.handler = logstash.TCPLogstashHandler(
+            self.logstash_server,
+            int(self.logstash_port),
+            version=1,
+            message_type=self.logstash_type
+        )
+        self.logger.addHandler(self.handler)
+        self.hostname = socket.gethostname()
+        self.session = str(uuid.uuid1())
+        self.errors = 0
+
    def v2_playbook_on_start(self, playbook):
        self.playbook = playbook._file_name
        data = {
--- a/plugins/callback/say.py
+++ b/plugins/callback/say.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
    description:
      - This plugin will use the 'say' or 'espeak' program to "speak" about play events.
    notes:
-      - In 2.8, this callback has been renamed from C(osx_say) into M(say).
+      - In 2.8, this callback has been renamed from C(osx_say) into M(community.general.say).
 '''

 import distutils.spawn
--- a/plugins/callback/selective.py
+++ b/plugins/callback/selective.py
@@ -30,8 +30,8 @@ DOCUMENTATION = '''
 '''

 EXAMPLES = """
-  - debug: msg="This will not be printed"
-  - debug: msg="But this will"
+  - ansible.builtin.debug: msg="This will not be printed"
+  - ansible.builtin.debug: msg="But this will"
    tags: [print_action]
 """

@@ -201,7 +201,7 @@ class CallbackModule(CallbackBase):
                                     )
            if 'results' in result._result:
                for r in result._result['results']:
-                    failed = 'failed' in r
+                    failed = 'failed' in r and r['failed']

                    stderr = [r.get('exception', None), r.get('module_stderr', None)]
                    stderr = "\n".join([e for e in stderr if e]).strip()
--- a/plugins/callback/splunk.py
+++ b/plugins/callback/splunk.py
@@ -45,6 +45,18 @@ DOCUMENTATION = '''
        ini:
          - section: callback_splunk
            key: authtoken
+      validate_certs:
+        description: Whether to validate certificates for connections to HEC. It is not recommended to set to
+                     C(false) except when you are sure that nobody can intercept the connection
+                     between this plugin and HEC, as setting it to C(false) allows man-in-the-middle attacks!
+        env:
+          - name: SPLUNK_VALIDATE_CERTS
+        ini:
+          - section: callback_splunk
+            key: validate_certs
+        type: bool
+        default: true
+        version_added: '1.0.0'
 '''

 EXAMPLES = '''
@@ -84,7 +96,7 @@ class SplunkHTTPCollectorSource(object):
        self.ip_address = socket.gethostbyname(socket.gethostname())
        self.user = getpass.getuser()

-    def send_event(self, url, authtoken, state, result, runtime):
+    def send_event(self, url, authtoken, validate_certs, state, result, runtime):
        if result._task_fields['args'].get('_ansible_check_mode') is True:
            self.ansible_check_mode = True

@@ -129,7 +141,8 @@ class SplunkHTTPCollectorSource(object):
                'Content-type': 'application/json',
                'Authorization': 'Splunk ' + authtoken
            },
-            method='POST'
+            method='POST',
+            validate_certs=validate_certs
        )


@@ -144,6 +157,7 @@ class CallbackModule(CallbackBase):
        self.start_datetimes = {}  # Collect task start times
        self.url = None
        self.authtoken = None
+        self.validate_certs = None
        self.splunk = SplunkHTTPCollectorSource()

    def _runtime(self, result):
@@ -153,7 +167,9 @@ class CallbackModule(CallbackBase):
        ).total_seconds()

    def set_options(self, task_keys=None, var_options=None, direct=None):
-        super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
+        super(CallbackModule, self).set_options(task_keys=task_keys,
+                                                var_options=var_options,
+                                                direct=direct)

        self.url = self.get_option('url')

@@ -175,6 +191,8 @@ class CallbackModule(CallbackBase):
                                  '`SPLUNK_AUTHTOKEN` environment variable or '
                                  'in the ansible.cfg file.')

+        self.validate_certs = self.get_option('validate_certs')
+
    def v2_playbook_on_start(self, playbook):
        self.splunk.ansible_playbook = basename(playbook._file_name)

@@ -188,6 +206,7 @@ class CallbackModule(CallbackBase):
        self.splunk.send_event(
            self.url,
            self.authtoken,
+            self.validate_certs,
            'OK',
            result,
            self._runtime(result)
@@ -197,6 +216,7 @@ class CallbackModule(CallbackBase):
        self.splunk.send_event(
            self.url,
            self.authtoken,
+            self.validate_certs,
            'SKIPPED',
            result,
            self._runtime(result)
@@ -206,6 +226,7 @@ class CallbackModule(CallbackBase):
        self.splunk.send_event(
            self.url,
            self.authtoken,
+            self.validate_certs,
            'FAILED',
            result,
            self._runtime(result)
@@ -215,6 +236,7 @@ class CallbackModule(CallbackBase):
        self.splunk.send_event(
            self.url,
            self.authtoken,
+            self.validate_certs,
            'FAILED',
            result,
            self._runtime(result)
@@ -224,6 +246,7 @@ class CallbackModule(CallbackBase):
        self.splunk.send_event(
            self.url,
            self.authtoken,
+            self.validate_certs,
            'UNREACHABLE',
            result,
            self._runtime(result)
--- a/plugins/connection/oc.py
+++ b/plugins/connection/oc.py
@@ -147,7 +147,7 @@ DOCUMENTATION = '''
        aliases: [ oc_verify_ssl ]
 '''

-from ansible_collections.community.general.plugins.connection.kubectl import Connection as KubectlConnection
+from ansible_collections.community.kubernetes.plugins.connection.kubectl import Connection as KubectlConnection


 CONNECTION_TRANSPORT = 'oc'
--- a/plugins/doc_fragments/_gcp.py
+++ b/plugins/doc_fragments/_gcp.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, Google Inc.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # GCP doc fragment.
--- a/plugins/doc_fragments/alicloud.py
+++ b/plugins/doc_fragments/alicloud.py
@@ -3,6 +3,9 @@
 # Copyright (c) 2017-present Alibaba Group Holding Limited. He Guimin <heguimin36@163.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/auth_basic.py
+++ b/plugins/doc_fragments/auth_basic.py
@@ -2,6 +2,9 @@

 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/digital_ocean.py
+++ b/plugins/doc_fragments/digital_ocean.py
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2018, Ansible Project
-# Copyright: (c) 2018, Abhijeet Kasurde (akasurde@redhat.com)
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-
-class ModuleDocFragment(object):
-    # Parameters for DigitalOcean modules
-    DOCUMENTATION = r'''
-options:
-  oauth_token:
-    description:
-     - DigitalOcean OAuth token.
-     - "There are several other environment variables which can be used to provide this value."
-     - "i.e., - 'DO_API_TOKEN', 'DO_API_KEY', 'DO_OAUTH_TOKEN' and 'OAUTH_TOKEN'"
-    type: str
-    aliases: [ api_token ]
-  timeout:
-    description:
-    - The timeout in seconds used for polling DigitalOcean's API.
-    type: int
-    default: 30
-  validate_certs:
-    description:
-    - If set to C(no), the SSL certificates will not be validated.
-    - This should only set to C(no) used on personally controlled sites using self-signed certificates.
-    type: bool
-    default: yes
-'''
--- a/plugins/doc_fragments/dimensiondata.py
+++ b/plugins/doc_fragments/dimensiondata.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2016, Dimension Data
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 # Authors:
 #   - Adam Friedman  <tintoy@tintoy.io>

--- a/plugins/doc_fragments/dimensiondata_wait.py
+++ b/plugins/doc_fragments/dimensiondata_wait.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2016, Dimension Data
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 # Authors:
 #   - Adam Friedman  <tintoy@tintoy.io>

--- a/plugins/doc_fragments/docker.py
+++ b/plugins/doc_fragments/docker.py
@@ -101,7 +101,7 @@ notes:
    with the product that sets up the environment. It will set these variables for you. See
    U(https://docs.docker.com/machine/reference/env/) for more details.
  - When connecting to Docker daemon with TLS, you might need to install additional Python packages.
-    For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(pip).
+    For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(ansible.builtin.pip).
  - Note that the Docker SDK for Python only allows to specify the path to the Docker configuration for very few functions.
    In general, it will use C($HOME/.docker/config.json) if the C(DOCKER_CONFIG) environment variable is not specified,
    and use C($DOCKER_CONFIG/config.json) otherwise.
--- a/plugins/doc_fragments/emc.py
+++ b/plugins/doc_fragments/emc.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, Luca Lorenzetto (@remix_tj) <lorenzetto.luca@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/hetzner.py
+++ b/plugins/doc_fragments/hetzner.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2019 Felix Fontein <felix@fontein.de>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/hpe3par.py
+++ b/plugins/doc_fragments/hpe3par.py
@@ -2,6 +2,9 @@
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/hwc.py
+++ b/plugins/doc_fragments/hwc.py
@@ -2,6 +2,9 @@
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/infinibox.py
+++ b/plugins/doc_fragments/infinibox.py
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2016, Gregory Shulov <gregory.shulov@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-
-class ModuleDocFragment(object):
-
-    # Standard Infinibox documentation fragment
-    DOCUMENTATION = r'''
-options:
-  system:
-    description:
-      - Infinibox Hostname or IPv4 Address.
-    type: str
-    required: true
-  user:
-    description:
-      - Infinibox User username with sufficient priveledges ( see notes ).
-    required: false
-  password:
-    description:
-      - Infinibox User password.
-    type: str
-notes:
-  - This module requires infinisdk python library
-  - You must set INFINIBOX_USER and INFINIBOX_PASSWORD environment variables
-    if user and password arguments are not passed to the module directly
-  - Ansible uses the infinisdk configuration file C(~/.infinidat/infinisdk.ini) if no credentials are provided.
-    See U(http://infinisdk.readthedocs.io/en/latest/getting_started.html)
-requirements:
-  - "python >= 2.7"
-  - infinisdk
-'''
--- a/plugins/doc_fragments/influxdb.py
+++ b/plugins/doc_fragments/influxdb.py
@@ -4,6 +4,9 @@
 # Copyright: (c) 2017, Abhijeet Kasurde (akasurde@redhat.com)
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # Parameters for influxdb modules
--- a/plugins/doc_fragments/ipa.py
+++ b/plugins/doc_fragments/ipa.py
@@ -4,6 +4,9 @@
 # Copyright: (c) 2017-18, Abhijeet Kasurde (akasurde@redhat.com)
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # Parameters for FreeIPA/IPA modules
--- a/plugins/doc_fragments/keycloak.py
+++ b/plugins/doc_fragments/keycloak.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2017, Eike Frost <ei@kefro.st>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/kubevirt_common_options.py
+++ b/plugins/doc_fragments/kubevirt_common_options.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, KubeVirt Team <@kubevirt>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = r'''
--- a/plugins/doc_fragments/kubevirt_vm_options.py
+++ b/plugins/doc_fragments/kubevirt_vm_options.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, KubeVirt Team <@kubevirt>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/ldap.py
+++ b/plugins/doc_fragments/ldap.py
@@ -5,6 +5,9 @@
 # Copyright: (c) 2017-2018 Keller Fuchs (@KellerFuchs) <kellerfuchs@hashbang.sh>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # Standard LDAP documentation fragment
--- a/plugins/doc_fragments/lxca_common.py
+++ b/plugins/doc_fragments/lxca_common.py
@@ -1,34 +1,10 @@
 # -*- coding: utf-8 -*-

-# This code is part of Ansible, but is an independent component.
-# This particular file snippet, and this file snippet only, is BSD licensed.
-# Modules you write using this snippet, which is embedded dynamically by
-# Ansible still belong to the author of the module, and may assign their
-# own license to the complete work.
-#
 # Copyright (C) 2017 Lenovo, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
+# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type


 class ModuleDocFragment(object):
--- a/plugins/doc_fragments/manageiq.py
+++ b/plugins/doc_fragments/manageiq.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2017, Daniel Korn <korndaniel1@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/mysql.py
+++ b/plugins/doc_fragments/mysql.py
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2015, Jonathan Mainguy <jon@soh.re>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-
-class ModuleDocFragment(object):
-
-    # Standard mysql documentation fragment
-    DOCUMENTATION = r'''
-options:
-  login_user:
-    description:
-      - The username used to authenticate with.
-    type: str
-  login_password:
-    description:
-      - The password used to authenticate with.
-    type: str
-  login_host:
-    description:
-      - Host running the database.
-      - In some cases for local connections the I(login_unix_socket=/path/to/mysqld/socket),
-        that is usually C(/var/run/mysqld/mysqld.sock), needs to be used instead of I(login_host=localhost).
-    type: str
-    default: localhost
-  login_port:
-    description:
-      - Port of the MySQL server. Requires I(login_host) be defined as other than localhost if login_port is used.
-    type: int
-    default: 3306
-  login_unix_socket:
-    description:
-      - The path to a Unix domain socket for local connections.
-    type: str
-  connect_timeout:
-    description:
-      - The connection timeout when connecting to the MySQL server.
-    type: int
-    default: 30
-  config_file:
-    description:
-      - Specify a config file from which user and password are to be read.
-    type: path
-    default: '~/.my.cnf'
-  ca_cert:
-    description:
-      - The path to a Certificate Authority (CA) certificate. This option, if used, must specify the same certificate
-        as used by the server.
-    type: path
-    aliases: [ ssl_ca ]
-  client_cert:
-    description:
-      - The path to a client public key certificate.
-    type: path
-    aliases: [ ssl_cert ]
-  client_key:
-    description:
-      - The path to the client private key.
-    type: path
-    aliases: [ ssl_key ]
-requirements:
-   - PyMySQL (Python 2.7 and Python 3.X), or
-   - MySQLdb (Python 2.x)
-notes:
-   - Requires the PyMySQL (Python 2.7 and Python 3.X) or MySQL-python (Python 2.X) package on the remote host.
-     The Python package may be installed with apt-get install python-pymysql (Ubuntu; see M(apt)) or
-     yum install python2-PyMySQL (RHEL/CentOS/Fedora; see M(yum)). You can also use dnf install python2-PyMySQL
-     for newer versions of Fedora; see M(dnf).
-   - Both C(login_password) and C(login_user) are required when you are
-     passing credentials. If none are present, the module will attempt to read
-     the credentials from C(~/.my.cnf), and finally fall back to using the MySQL
-     default login of 'root' with no password.
-   - If there are problems with local connections, using I(login_unix_socket=/path/to/mysqld/socket)
-     instead of I(login_host=localhost) might help. As an example, the default MariaDB installation of version 10.4
-     and later uses the unix_socket authentication plugin by default that
-     without using I(login_unix_socket=/var/run/mysqld/mysqld.sock) (the default path)
-     causes the error ``Host '127.0.0.1' is not allowed to connect to this MariaDB server``.
-'''
--- a/plugins/doc_fragments/nios.py
+++ b/plugins/doc_fragments/nios.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/oneview.py
+++ b/plugins/doc_fragments/oneview.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2016-2017, Hewlett Packard Enterprise Development LP
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/online.py
+++ b/plugins/doc_fragments/online.py
@@ -2,6 +2,9 @@

 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/opennebula.py
+++ b/plugins/doc_fragments/opennebula.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, www.privaz.io Valletech AB
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # OpenNebula common documentation
--- a/plugins/doc_fragments/openswitch.py
+++ b/plugins/doc_fragments/openswitch.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/oracle.py
+++ b/plugins/doc_fragments/oracle.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/oracle_creatable_resource.py
+++ b/plugins/doc_fragments/oracle_creatable_resource.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/oracle_display_name_option.py
+++ b/plugins/doc_fragments/oracle_display_name_option.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/oracle_name_option.py
+++ b/plugins/doc_fragments/oracle_name_option.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/oracle_tags.py
+++ b/plugins/doc_fragments/oracle_tags.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/oracle_wait_options.py
+++ b/plugins/doc_fragments/oracle_wait_options.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = """
--- a/plugins/doc_fragments/ovirt_facts.py
+++ b/plugins/doc_fragments/ovirt_facts.py
@@ -54,5 +54,5 @@ requirements:
 notes:
  - "In order to use this module you have to install oVirt Python SDK.
     To ensure it's installed with correct version you can create the following task:
-     pip: name=ovirt-engine-sdk-python version=4.3.0"
+     ansible.builtin.pip: name=ovirt-engine-sdk-python version=4.3.0"
 '''
--- a/plugins/doc_fragments/postgres.py
+++ b/plugins/doc_fragments/postgres.py
@@ -2,6 +2,9 @@

 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # Postgres documentation fragment
--- a/plugins/doc_fragments/proxysql.py
+++ b/plugins/doc_fragments/proxysql.py
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2017, Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt
-
-
-class ModuleDocFragment(object):
-
-    # Documentation fragment for ProxySQL connectivity
-    CONNECTIVITY = r'''
-options:
-  login_user:
-    description:
-      - The username used to authenticate to ProxySQL admin interface.
-    type: str
-  login_password:
-    description:
-      - The password used to authenticate to ProxySQL admin interface.
-    type: str
-  login_host:
-    description:
-      - The host used to connect to ProxySQL admin interface.
-    type: str
-    default: '127.0.0.1'
-  login_port:
-    description:
-      - The port used to connect to ProxySQL admin interface.
-    type: int
-    default: 6032
-  config_file:
-    description:
-      - Specify a config file from which I(login_user) and I(login_password)
-        are to be read.
-    type: path
-    default: ''
-requirements:
-   - PyMySQL (Python 2.7 and Python 3.X), or
-   - MySQLdb (Python 2.x)
-'''
-
-    # Documentation fragment for managing ProxySQL configuration
-    MANAGING_CONFIG = r'''
-options:
-  save_to_disk:
-    description:
-      - Save config to sqlite db on disk to persist the configuration.
-    type: bool
-    default: 'yes'
-  load_to_runtime:
-    description:
-      - Dynamically load config to runtime memory.
-    type: bool
-    default: 'yes'
-'''
--- a/plugins/doc_fragments/purestorage.py
+++ b/plugins/doc_fragments/purestorage.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2017, Simon Dodsley <simon@purestorage.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/rackspace.py
+++ b/plugins/doc_fragments/rackspace.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2014, Matt Martz <matt@sivel.net>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/scaleway.py
+++ b/plugins/doc_fragments/scaleway.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, Yanis Guenane <yanis+ansible@guenane.org>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/utm.py
+++ b/plugins/doc_fragments/utm.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, Johannes Brunswicker <johannes.brunswicker@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    DOCUMENTATION = r'''
--- a/plugins/doc_fragments/vexata.py
+++ b/plugins/doc_fragments/vexata.py
@@ -2,6 +2,9 @@
 # Copyright: (c) 2019, Sandeep Kasargod <sandeep@vexata.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):

--- a/plugins/doc_fragments/xenserver.py
+++ b/plugins/doc_fragments/xenserver.py
@@ -3,6 +3,9 @@
 # Copyright: (c) 2018, Bojan Vitnik <bvitnik@mainstream.rs>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

 class ModuleDocFragment(object):
    # Common parameters for XenServer modules
--- a/plugins/filter/json_query.py
+++ b/plugins/filter/json_query.py
@@ -29,7 +29,7 @@ except ImportError:

 def json_query(data, expr):
    '''Query data using jmespath query language ( http://jmespath.org ). Example:
-    - debug: msg="{{ instance | json_query(tagged_instances[*].block_device_mapping.*.volume_id') }}"
+    - ansible.builtin.debug: msg="{{ instance | json_query(tagged_instances[*].block_device_mapping.*.volume_id') }}"
    '''
    if not HAS_LIB:
        raise AnsibleError('You need to install "jmespath" prior to running '
--- a/plugins/inventory/cobbler.py
+++ b/plugins/inventory/cobbler.py
@@ -0,0 +1,278 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Orion Poplawski <orion@nwra.com>
+# Copyright (c) 2020 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+DOCUMENTATION = '''
+    name: cobbler
+    plugin_type: inventory
+    short_description: Cobbler inventory source
+    version_added: 1.0.0
+    description:
+        - Get inventory hosts from the cobbler service.
+        - "Uses a configuration file as an inventory source, it must end in C(.cobbler.yml) or C(.cobbler.yaml) and has a C(plugin: cobbler) entry."
+    extends_documentation_fragment:
+        - inventory_cache
+    options:
+      plugin:
+        description: The name of this plugin, it should always be set to C(cobbler) for this plugin to recognize it as it's own.
+        required: yes
+        choices: ['cobbler']
+      url:
+        description: URL to cobbler.
+        default: 'http://cobbler/cobbler_api'
+        env:
+            - name: COBBLER_SERVER
+      user:
+        description: Cobbler authentication user.
+        required: no
+        env:
+            - name: COBBLER_USER
+      password:
+        description: Cobbler authentication password
+        required: no
+        env:
+            - name: COBBLER_PASSWORD
+      cache_fallback:
+        description: Fallback to cached results if connection to cobbler fails
+        type: boolean
+        default: no
+      exclude_profiles:
+        description: Profiles to exclude from inventory
+        type: list
+        default: []
+        elements: str
+      group_by:
+        description: Keys to group hosts by
+        type: list
+        default: [ 'mgmt_classes', 'owners', 'status' ]
+      group:
+        description: Group to place all hosts into
+        default: cobbler
+      group_prefix:
+        description: Prefix to apply to cobbler groups
+        default: cobbler_
+      want_facts:
+        description: Toggle, if C(true) the plugin will retrieve host facts from the server
+        type: boolean
+        default: yes
+'''
+
+EXAMPLES = '''
+# my.cobbler.yml
+plugin: community.general.cobbler
+url: http://cobbler/cobbler_api
+user: ansible-tester
+password: secure
+'''
+
+from distutils.version import LooseVersion
+import socket
+
+from ansible.errors import AnsibleError
+from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils.common._collections_compat import MutableMapping
+from ansible.module_utils.six import iteritems
+from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name
+
+# xmlrpc
+try:
+    import xmlrpclib as xmlrpc_client
+    HAS_XMLRPC_CLIENT = True
+except ImportError:
+    try:
+        import xmlrpc.client as xmlrpc_client
+        HAS_XMLRPC_CLIENT = True
+    except ImportError:
+        HAS_XMLRPC_CLIENT = False
+
+
+class InventoryModule(BaseInventoryPlugin, Cacheable):
+    ''' Host inventory parser for ansible using cobbler as source. '''
+
+    NAME = 'cobbler'
+
+    def __init__(self):
+
+        super(InventoryModule, self).__init__()
+
+        # from config
+        self.cobbler_url = None
+        self.exclude_profiles = []  # A list of profiles to exclude
+
+        self.connection = None
+        self.token = None
+
+        self.cache_key = None
+        self.use_cache = None
+
+    def verify_file(self, path):
+        valid = False
+        if super(InventoryModule, self).verify_file(path):
+            if path.endswith(('cobbler.yaml', 'cobbler.yml')):
+                valid = True
+            else:
+                self.display.vvv('Skipping due to inventory source not ending in "cobbler.yaml" nor "cobbler.yml"')
+        return valid
+
+    def _get_connection(self):
+        if not HAS_XMLRPC_CLIENT:
+            raise AnsibleError('Could not import xmlrpc client library')
+
+        if self.connection is None:
+            self.display.vvvv('Connecting to %s\n' % self.cobbler_url)
+            self.connection = xmlrpc_client.Server(self.cobbler_url, allow_none=True)
+            self.token = None
+            if self.get_option('user') is not None:
+                self.token = self.connection.login(self.get_option('user'), self.get_option('password'))
+        return self.connection
+
+    def _init_cache(self):
+        if self.cache_key not in self._cache:
+            self._cache[self.cache_key] = {}
+
+    def _reload_cache(self):
+        if self.get_option('cache_fallback'):
+            self.display.vvv('Cannot connect to server, loading cache\n')
+            self._options['cache_timeout'] = 0
+            self.load_cache_plugin()
+            self._cache.get(self.cache_key, {})
+
+    def _get_profiles(self):
+        if not self.use_cache or 'profiles' not in self._cache.get(self.cache_key, {}):
+            c = self._get_connection()
+            try:
+                if self.token is not None:
+                    data = c.get_profiles(self.token)
+                else:
+                    data = c.get_profiles()
+            except (socket.gaierror, socket.error, xmlrpc_client.ProtocolError):
+                self._reload_cache()
+            else:
+                self._init_cache()
+                self._cache[self.cache_key]['profiles'] = data
+
+        return self._cache[self.cache_key]['profiles']
+
+    def _get_systems(self):
+        if not self.use_cache or 'systems' not in self._cache.get(self.cache_key, {}):
+            c = self._get_connection()
+            try:
+                if self.token is not None:
+                    data = c.get_systems(self.token)
+                else:
+                    data = c.get_systems()
+            except (socket.gaierror, socket.error, xmlrpc_client.ProtocolError):
+                self._reload_cache()
+            else:
+                self._init_cache()
+                self._cache[self.cache_key]['systems'] = data
+
+        return self._cache[self.cache_key]['systems']
+
+    def _add_safe_group_name(self, group, child=None):
+        group_name = self.inventory.add_group(to_safe_group_name('%s%s' % (self.get_option('group_prefix'), group.lower().replace(" ", ""))))
+        if child is not None:
+            self.inventory.add_child(group_name, child)
+        return group_name
+
+    def parse(self, inventory, loader, path, cache=True):
+
+        super(InventoryModule, self).parse(inventory, loader, path)
+
+        # read config from file, this sets 'options'
+        self._read_config_data(path)
+
+        # get connection host
+        self.cobbler_url = self.get_option('url')
+        self.cache_key = self.get_cache_key(path)
+        self.use_cache = cache and self.get_option('cache')
+
+        self.exclude_profiles = self.get_option('exclude_profiles')
+        self.group_by = self.get_option('group_by')
+
+        for profile in self._get_profiles():
+            if profile['parent']:
+                self.display.vvvv('Processing profile %s with parent %s\n' % (profile['name'], profile['parent']))
+                if profile['parent'] not in self.exclude_profiles:
+                    parent_group_name = self._add_safe_group_name(profile['parent'])
+                    self.display.vvvv('Added profile parent group %s\n' % parent_group_name)
+                    if profile['name'] not in self.exclude_profiles:
+                        group_name = self._add_safe_group_name(profile['name'])
+                        self.display.vvvv('Added profile group %s\n' % group_name)
+                        self.inventory.add_child(parent_group_name, group_name)
+            else:
+                self.display.vvvv('Processing profile %s without parent\n' % profile['name'])
+                # Create a heirarchy of profile names
+                profile_elements = profile['name'].split('-')
+                i = 0
+                while i < len(profile_elements) - 1:
+                    profile_group = '-'.join(profile_elements[0:i + 1])
+                    profile_group_child = '-'.join(profile_elements[0:i + 2])
+                    if profile_group in self.exclude_profiles:
+                        self.display.vvvv('Excluding profile %s\n' % profile_group)
+                        break
+                    group_name = self._add_safe_group_name(profile_group)
+                    self.display.vvvv('Added profile group %s\n' % group_name)
+                    child_group_name = self._add_safe_group_name(profile_group_child)
+                    self.display.vvvv('Added profile child group %s to %s\n' % (child_group_name, group_name))
+                    self.inventory.add_child(group_name, child_group_name)
+                    i = i + 1
+
+        # Add default group for this inventory if specified
+        self.group = to_safe_group_name(self.get_option('group'))
+        if self.group is not None and self.group != '':
+            self.inventory.add_group(self.group)
+            self.display.vvvv('Added site group %s\n' % self.group)
+
+        for host in self._get_systems():
+            # Get the FQDN for the host and add it to the right groups
+            hostname = host['hostname']  # None
+            interfaces = host['interfaces']
+
+            if host['profile'] in self.exclude_profiles:
+                self.display.vvvv('Excluding host %s in profile %s\n' % (host['name'], host['profile']))
+                continue
+
+            # hostname is often empty for non-static IP hosts
+            if hostname == '':
+                for (iname, ivalue) in iteritems(interfaces):
+                    if ivalue['management'] or not ivalue['static']:
+                        this_dns_name = ivalue.get('dns_name', None)
+                        if this_dns_name is not None and this_dns_name != "":
+                            hostname = this_dns_name
+                            self.display.vvvv('Set hostname to %s from %s\n' % (hostname, iname))
+
+            if hostname == '':
+                self.display.vvvv('Cannot determine hostname for host %s, skipping\n' % host['name'])
+                continue
+
+            self.inventory.add_host(hostname)
+            self.display.vvvv('Added host %s hostname %s\n' % (host['name'], hostname))
+
+            # Add host to profile group
+            group_name = self._add_safe_group_name(host['profile'], child=hostname)
+            self.display.vvvv('Added host %s to profile group %s\n' % (hostname, group_name))
+
+            # Add host to groups specified by group_by fields
+            for group_by in self.group_by:
+                if host[group_by] == '<<inherit>>':
+                    groups = []
+                else:
+                    groups = [host[group_by]] if isinstance(host[group_by], str) else host[group_by]
+                for group in groups:
+                    group_name = self._add_safe_group_name(group, child=hostname)
+                    self.display.vvvv('Added host %s to group_by %s group %s\n' % (hostname, group_by, group_name))
+
+            # Add to group for this inventory
+            if self.group is not None:
+                self.inventory.add_child(self.group, hostname)
+
+            # Add host variables
+            if self.get_option('want_facts'):
+                try:
+                    self.inventory.set_variable(hostname, 'cobbler', host)
+                except ValueError as e:
+                    self.display.warning("Could not set host info for %s: %s" % (hostname, to_text(e)))
--- a/plugins/inventory/gitlab_runners.py
+++ b/plugins/inventory/gitlab_runners.py
@@ -30,17 +30,26 @@ DOCUMENTATION = '''
              - gitlab_runners
        server_url:
            description: The URL of the GitLab server, with protocol (i.e. http or https).
+            env:
+              - name: GITLAB_SERVER_URL
+                version_added: 1.0.0
            type: str
            required: true
            default: https://gitlab.com
        api_token:
            description: GitLab token for logging in.
+            env:
+              - name: GITLAB_API_TOKEN
+                version_added: 1.0.0
            type: str
            aliases:
              - private_token
              - access_token
        filter:
            description: filter runners from GitLab API
+            env:
+              - name: GITLAB_FILTER
+                version_added: 1.0.0
            type: str
            choices: ['active', 'paused', 'online', 'specific', 'shared']
        verbose_output:
--- a/plugins/inventory/kubevirt.py
+++ b/plugins/inventory/kubevirt.py
@@ -103,6 +103,7 @@ DOCUMENTATION = '''
                - In case of multiple network attached to virtual machine, define which interface should be returned as primary IP
                    address.
                type: str
+                aliases: [ interface_name ]
            api_version:
                description:
                - "Specify the KubeVirt API version."
--- a/plugins/lookup/cartesian.py
+++ b/plugins/lookup/cartesian.py
@@ -20,10 +20,10 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: Example of the change in the description
-  debug: msg="{{ lookup('cartesian', [1,2,3], [a, b])}}"
+  ansible.builtin.debug: msg="{{ lookup('cartesian', [1,2,3], [a, b])}}"

 - name: loops over the cartesian product of the supplied lists
-  debug: msg="{{item}}"
+  ansible.builtin.debug: msg="{{item}}"
  with_cartesian:
    - "{{list1}}"
    - "{{list2}}"
--- a/plugins/lookup/chef_databag.py
+++ b/plugins/lookup/chef_databag.py
@@ -27,7 +27,7 @@ DOCUMENTATION = '''
 '''

 EXAMPLES = """
-    - debug:
+    - ansible.builtin.debug:
        msg: "{{ lookup('chef_databag', 'name=data_bag_name item=data_bag_item') }}"
 """

--- a/plugins/lookup/conjur_variable.py
+++ b/plugins/lookup/conjur_variable.py
@@ -1,159 +0,0 @@
-# (c) 2018, Jason Vanderhoof <jason.vanderhoof@cyberark.com>, Oren Ben Meir <oren.benmeir@cyberark.com>
-# (c) 2018 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    lookup: conjur_variable
-    short_description: Fetch credentials from CyberArk Conjur.
-    description:
-      - "Retrieves credentials from Conjur using the controlling host's Conjur identity. Conjur info: U(https://www.conjur.org/)."
-    requirements:
-      - 'The controlling host running Ansible has a Conjur identity.
-        (More: U(https://docs.conjur.org/Latest/en/Content/Get%20Started/key_concepts/machine_identity.html))'
-    options:
-      _term:
-        description: Variable path
-        required: True
-      identity_file:
-        description: Path to the Conjur identity file. The identity file follows the netrc file format convention.
-        type: path
-        default: /etc/conjur.identity
-        required: False
-        ini:
-          - section: conjur,
-            key: identity_file_path
-        env:
-          - name: CONJUR_IDENTITY_FILE
-      config_file:
-        description: Path to the Conjur configuration file. The configuration file is a YAML file.
-        type: path
-        default: /etc/conjur.conf
-        required: False
-        ini:
-          - section: conjur,
-            key: config_file_path
-        env:
-          - name: CONJUR_CONFIG_FILE
-'''
-
-EXAMPLES = """
-  - debug:
-      msg: "{{ lookup('conjur_variable', '/path/to/secret') }}"
-"""
-
-RETURN = """
-  _raw:
-    description:
-      - Value stored in Conjur.
-"""
-
-import os.path
-from ansible.errors import AnsibleError
-from ansible.plugins.lookup import LookupBase
-from base64 import b64encode
-from netrc import netrc
-from os import environ
-from time import time
-from ansible.module_utils.six.moves.urllib.parse import quote_plus
-import yaml
-
-from ansible.module_utils.urls import open_url
-from ansible.utils.display import Display
-
-display = Display()
-
-
-# Load configuration and return as dictionary if file is present on file system
-def _load_conf_from_file(conf_path):
-    display.vvv('conf file: {0}'.format(conf_path))
-
-    if not os.path.exists(conf_path):
-        raise AnsibleError('Conjur configuration file `{0}` was not found on the controlling host'
-                           .format(conf_path))
-
-    display.vvvv('Loading configuration from: {0}'.format(conf_path))
-    with open(conf_path) as f:
-        config = yaml.safe_load(f.read())
-        if 'account' not in config or 'appliance_url' not in config:
-            raise AnsibleError('{0} on the controlling host must contain an `account` and `appliance_url` entry'
-                               .format(conf_path))
-        return config
-
-
-# Load identity and return as dictionary if file is present on file system
-def _load_identity_from_file(identity_path, appliance_url):
-    display.vvvv('identity file: {0}'.format(identity_path))
-
-    if not os.path.exists(identity_path):
-        raise AnsibleError('Conjur identity file `{0}` was not found on the controlling host'
-                           .format(identity_path))
-
-    display.vvvv('Loading identity from: {0} for {1}'.format(identity_path, appliance_url))
-
-    conjur_authn_url = '{0}/authn'.format(appliance_url)
-    identity = netrc(identity_path)
-
-    if identity.authenticators(conjur_authn_url) is None:
-        raise AnsibleError('The netrc file on the controlling host does not contain an entry for: {0}'
-                           .format(conjur_authn_url))
-
-    id, account, api_key = identity.authenticators(conjur_authn_url)
-    if not id or not api_key:
-        raise AnsibleError('{0} on the controlling host must contain a `login` and `password` entry for {1}'
-                           .format(identity_path, appliance_url))
-
-    return {'id': id, 'api_key': api_key}
-
-
-# Use credentials to retrieve temporary authorization token
-def _fetch_conjur_token(conjur_url, account, username, api_key):
-    conjur_url = '{0}/authn/{1}/{2}/authenticate'.format(conjur_url, account, username)
-    display.vvvv('Authentication request to Conjur at: {0}, with user: {1}'.format(conjur_url, username))
-
-    response = open_url(conjur_url, data=api_key, method='POST')
-    code = response.getcode()
-    if code != 200:
-        raise AnsibleError('Failed to authenticate as \'{0}\' (got {1} response)'
-                           .format(username, code))
-
-    return response.read()
-
-
-# Retrieve Conjur variable using the temporary token
-def _fetch_conjur_variable(conjur_variable, token, conjur_url, account):
-    token = b64encode(token)
-    headers = {'Authorization': 'Token token="{0}"'.format(token)}
-    display.vvvv('Header: {0}'.format(headers))
-
-    url = '{0}/secrets/{1}/variable/{2}'.format(conjur_url, account, quote_plus(conjur_variable))
-    display.vvvv('Conjur Variable URL: {0}'.format(url))
-
-    response = open_url(url, headers=headers, method='GET')
-
-    if response.getcode() == 200:
-        display.vvvv('Conjur variable {0} was successfully retrieved'.format(conjur_variable))
-        return [response.read()]
-    if response.getcode() == 401:
-        raise AnsibleError('Conjur request has invalid authorization credentials')
-    if response.getcode() == 403:
-        raise AnsibleError('The controlling host\'s Conjur identity does not have authorization to retrieve {0}'
-                           .format(conjur_variable))
-    if response.getcode() == 404:
-        raise AnsibleError('The variable {0} does not exist'.format(conjur_variable))
-
-    return {}
-
-
-class LookupModule(LookupBase):
-
-    def run(self, terms, variables=None, **kwargs):
-        conf_file = self.get_option('config_file')
-        conf = _load_conf_from_file(conf_file)
-
-        identity_file = self.get_option('identity_file')
-        identity = _load_identity_from_file(identity_file, conf['appliance_url'])
-
-        token = _fetch_conjur_token(conf['appliance_url'], conf['account'], identity['id'], identity['api_key'])
-        return _fetch_conjur_variable(terms[0], token, conf['appliance_url'], conf['account'])
--- a/plugins/lookup/consul_kv.py
+++ b/plugins/lookup/consul_kv.py
@@ -18,7 +18,6 @@ DOCUMENTATION = '''
      _raw:
        description: List of key(s) to retrieve.
        type: list
-        required: True
      recurse:
        type: boolean
        description: If true, will retrieve all the values that have the given key as prefix.
@@ -67,22 +66,31 @@ DOCUMENTATION = '''
        ini:
          - section: lookup_consul
            key: client_cert
+      url:
+        description: "The target to connect to, should look like this: C(https://my.consul.server:8500)."
+        type: str
+        version_added: 1.0.0
+        env:
+          - name: ANSIBLE_CONSUL_URL
+        ini:
+          - section: lookup_consul
+            key: url
 '''

 EXAMPLES = """
-  - debug:
+  - ansible.builtin.debug:
      msg: 'key contains {{item}}'
    with_consul_kv:
      - 'key/to/retrieve'

  - name: Parameters can be provided after the key be more specific about what to retrieve
-    debug:
+    ansible.builtin.debug:
      msg: 'key contains {{item}}'
    with_consul_kv:
      - 'key/to recurse=true token=E6C060A9-26FB-407A-B83E-12DDAFCB4D98'

  - name: retrieving a KV from a remote cluster on non default port
-    debug:
+    ansible.builtin.debug:
      msg: "{{ lookup('consul_kv', 'my/key', host='10.10.10.10', port='2000') }}"
 """

@@ -114,25 +122,29 @@ class LookupModule(LookupBase):
            raise AnsibleError(
                'python-consul is required for consul_kv lookup. see http://python-consul.readthedocs.org/en/latest/#installation')

+        # get options
+        self.set_options(direct=kwargs)
+
+        scheme = self.get_option('scheme')
+        host = self.get_option('host')
+        port = self.get_option('port')
+        url = self.get_option('url')
+        if url is not None:
+            u = urlparse(url)
+            if u.scheme:
+                scheme = u.scheme
+            host = u.hostname
+            if u.port is not None:
+                port = u.port
+
+        validate_certs = self.get_option('validate_certs')
+        client_cert = self.get_option('client_cert')
+
        values = []
        try:
            for term in terms:
                params = self.parse_params(term)
-                try:
-                    url = os.environ['ANSIBLE_CONSUL_URL']
-                    validate_certs = os.environ['ANSIBLE_CONSUL_VALIDATE_CERTS'] or True
-                    client_cert = os.environ['ANSIBLE_CONSUL_CLIENT_CERT'] or None
-                    u = urlparse(url)
-                    consul_api = consul.Consul(host=u.hostname, port=u.port, scheme=u.scheme, verify=validate_certs,
-                                               cert=client_cert)
-                except KeyError:
-                    port = kwargs.get('port', '8500')
-                    host = kwargs.get('host', 'localhost')
-                    scheme = kwargs.get('scheme', 'http')
-                    validate_certs = kwargs.get('validate_certs', True)
-                    client_cert = kwargs.get('client_cert', None)
-                    consul_api = consul.Consul(host=host, port=port, scheme=scheme, verify=validate_certs,
-                                               cert=client_cert)
+                consul_api = consul.Consul(host=host, port=port, scheme=scheme, verify=validate_certs, cert=client_cert)

                results = consul_api.kv.get(params['key'],
                                            token=params['token'],
--- a/plugins/lookup/credstash.py
+++ b/plugins/lookup/credstash.py
@@ -44,16 +44,16 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: first use credstash to store your secrets
-  shell: credstash put my-github-password secure123
+  ansible.builtin.shell: credstash put my-github-password secure123

 - name: "Test credstash lookup plugin -- get my github password"
-  debug: msg="Credstash lookup! {{ lookup('credstash', 'my-github-password') }}"
+  ansible.builtin.debug: msg="Credstash lookup! {{ lookup('credstash', 'my-github-password') }}"

 - name: "Test credstash lookup plugin -- get my other password from us-west-1"
-  debug: msg="Credstash lookup! {{ lookup('credstash', 'my-other-password', region='us-west-1') }}"
+  ansible.builtin.debug: msg="Credstash lookup! {{ lookup('credstash', 'my-other-password', region='us-west-1') }}"

 - name: "Test credstash lookup plugin -- get the company's github password"
-  debug: msg="Credstash lookup! {{ lookup('credstash', 'company-github-password', table='company-passwords') }}"
+  ansible.builtin.debug: msg="Credstash lookup! {{ lookup('credstash', 'company-github-password', table='company-passwords') }}"

 - name: Example play using the 'context' feature
  hosts: localhost
@@ -64,10 +64,10 @@ EXAMPLES = """
  tasks:

  - name: "Test credstash lookup plugin -- get the password with a context passed as a variable"
-    debug: msg="{{ lookup('credstash', 'some-password', context=context) }}"
+    ansible.builtin.debug: msg="{{ lookup('credstash', 'some-password', context=context) }}"

  - name: "Test credstash lookup plugin -- get the password with a context defined here"
-    debug: msg="{{ lookup('credstash', 'some-password', context=dict(app='my_app', environment='production')) }}"
+    ansible.builtin.debug: msg="{{ lookup('credstash', 'some-password', context=dict(app='my_app', environment='production')) }}"
 """

 RETURN = """
--- a/plugins/lookup/cyberarkpassword.py
+++ b/plugins/lookup/cyberarkpassword.py
@@ -36,7 +36,7 @@ DOCUMENTATION = '''

 EXAMPLES = """
  - name: passing options to the lookup
-    debug: msg={{ lookup("cyberarkpassword", cyquery)}}
+    ansible.builtin.debug: msg={{ lookup("cyberarkpassword", cyquery)}}
    vars:
      cyquery:
        appid: "app_ansible"
@@ -45,7 +45,7 @@ EXAMPLES = """


  - name: used in a loop
-    debug: msg={{item}}
+    ansible.builtin.debug: msg={{item}}
    with_cyberarkpassword:
        appid: 'app_ansible'
        query: 'safe=CyberArk_Passwords;folder=root;object=AdminPass'
--- a/plugins/lookup/dig.py
+++ b/plugins/lookup/dig.py
@@ -44,24 +44,24 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: Simple A record (IPV4 address) lookup for example.com
-  debug: msg="{{ lookup('dig', 'example.com.')}}"
+  ansible.builtin.debug: msg="{{ lookup('dig', 'example.com.')}}"

 - name: "The TXT record for example.org."
-  debug: msg="{{ lookup('dig', 'example.org.', 'qtype=TXT') }}"
+  ansible.builtin.debug: msg="{{ lookup('dig', 'example.org.', 'qtype=TXT') }}"

 - name: "The TXT record for example.org, alternative syntax."
-  debug: msg="{{ lookup('dig', 'example.org./TXT') }}"
+  ansible.builtin.debug: msg="{{ lookup('dig', 'example.org./TXT') }}"

 - name: use in a loop
-  debug: msg="MX record for gmail.com {{ item }}"
+  ansible.builtin.debug: msg="MX record for gmail.com {{ item }}"
  with_items: "{{ lookup('dig', 'gmail.com./MX', wantlist=True) }}"

- debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '192.0.2.5/PTR') }}"
- debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '5.2.0.192.in-addr.arpa./PTR') }}"
- debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '5.2.0.192.in-addr.arpa.', 'qtype=PTR') }}"
- debug: msg="Querying 198.51.100.23 for IPv4 address for example.com. produces {{ lookup('dig', 'example.com', '@198.51.100.23') }}"
+- ansible.builtin.debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '192.0.2.5/PTR') }}"
+- ansible.builtin.debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '5.2.0.192.in-addr.arpa./PTR') }}"
+- ansible.builtin.debug: msg="Reverse DNS for 192.0.2.5 is {{ lookup('dig', '5.2.0.192.in-addr.arpa.', 'qtype=PTR') }}"
+- ansible.builtin.debug: msg="Querying 198.51.100.23 for IPv4 address for example.com. produces {{ lookup('dig', 'example.com', '@198.51.100.23') }}"

- debug: msg="XMPP service for gmail.com. is available at {{ item.target }} on port {{ item.port }}"
+- ansible.builtin.debug: msg="XMPP service for gmail.com. is available at {{ item.target }} on port {{ item.port }}"
  with_items: "{{ lookup('dig', '_xmpp-server._tcp.gmail.com./SRV', 'flat=0', wantlist=True) }}"
 """

--- a/plugins/lookup/dnstxt.py
+++ b/plugins/lookup/dnstxt.py
@@ -21,17 +21,17 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: show txt entry
-  debug: msg="{{lookup('dnstxt', ['test.example.com'])}}"
+  ansible.builtin.debug: msg="{{lookup('dnstxt', ['test.example.com'])}}"

 - name: iterate over txt entries
-  debug: msg="{{item}}"
+  ansible.builtin.debug: msg="{{item}}"
  with_dnstxt:
    - 'test.example.com'
    - 'other.example.com'
    - 'last.example.com'

 - name: iterate of a comma delimited DNS TXT entry
-  debug: msg="{{item}}"
+  ansible.builtin.debug: msg="{{item}}"
  with_dnstxt: "{{lookup('dnstxt', ['test.example.com']).split(',')}}"
 """

--- a/plugins/lookup/dsv.py
+++ b/plugins/lookup/dsv.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+# Copyright: (c) 2020, Adam Migus <adam@migus.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+DOCUMENTATION = r"""
+lookup: dsv
+author: Adam Migus (adam@migus.org)
+short_description: Get secrets from Thycotic DevOps Secrets Vault
+version_added: 1.0.0
+description:
+    - Uses the Thycotic DevOps Secrets Vault Python SDK to get Secrets from a
+      DSV I(tenant) using a I(client_id) and I(client_secret).
+requirements:
+    - python-dsv-sdk - https://pypi.org/project/python-dsv-sdk/
+options:
+    _terms:
+        description: The path to the secret, e.g. C(/staging/servers/web1).
+        required: true
+    tenant:
+        description: The first format parameter in the default I(url_template).
+        env:
+            - name: DSV_TENANT
+        ini:
+            - section: dsv_lookup
+              key: tenant
+        required: true
+    tld:
+        default: com
+        description: The top-level domain of the tenant; the second format
+            parameter in the default I(url_template).
+        env:
+            - name: DSV_TLD
+        ini:
+            - section: dsv_lookup
+              key: tld
+        required: false
+    client_id:
+        description: The client_id with which to request the Access Grant.
+        env:
+            - name: DSV_CLIENT_ID
+        ini:
+            - section: dsv_lookup
+              key: client_id
+        required: true
+    client_secret:
+        description: The client secret associated with the specific I(client_id).
+        env:
+            - name: DSV_CLIENT_SECRET
+        ini:
+            - section: dsv_lookup
+              key: client_secret
+        required: true
+    url_template:
+        default: https://{}.secretsvaultcloud.{}/v1
+        description: The path to prepend to the base URL to form a valid REST
+            API request.
+        env:
+            - name: DSV_URL_TEMPLATE
+        ini:
+            - section: dsv_lookup
+              key: url_template
+        required: false
+"""
+
+RETURN = r"""
+_list:
+    description:
+        - One or more JSON responses to C(GET /secrets/{path}).
+        - See U(https://dsv.thycotic.com/api/index.html#operation/getSecret).
+"""
+
+EXAMPLES = r"""
+- hosts: localhost
+  vars:
+      secret: "{{ lookup('community.general.dsv', '/test/secret') }}"
+  tasks:
+      - ansible.builtin.debug:
+          msg: 'the password is {{ secret["data"]["password"] }}'
+"""
+
+from ansible.errors import AnsibleError, AnsibleOptionsError
+
+sdk_is_missing = False
+
+try:
+    from thycotic.secrets.vault import (
+        SecretsVault,
+        SecretsVaultError,
+    )
+except ImportError:
+    sdk_is_missing = True
+
+from ansible.utils.display import Display
+from ansible.plugins.lookup import LookupBase
+
+
+display = Display()
+
+
+class LookupModule(LookupBase):
+    @staticmethod
+    def Client(vault_parameters):
+        return SecretsVault(**vault_parameters)
+
+    def run(self, terms, variables, **kwargs):
+        if sdk_is_missing:
+            raise AnsibleError("python-dsv-sdk must be installed to use this plugin")
+
+        self.set_options(var_options=variables, direct=kwargs)
+
+        vault = LookupModule.Client(
+            **{
+                "tenant": self.get_option("tenant"),
+                "client_id": self.get_option("client_id"),
+                "client_secret": self.get_option("client_secret"),
+                "url_template": self.get_option("url_template"),
+            }
+        )
+        result = []
+
+        for term in terms:
+            display.debug("dsv_lookup term: %s" % term)
+            try:
+                path = term.lstrip("[/:]")
+
+                if path == "":
+                    raise AnsibleOptionsError("Invalid secret path: %s" % term)
+
+                display.vvv(u"DevOps Secrets Vault GET /secrets/%s" % path)
+                result.append(vault.get_secret_json(path))
+            except SecretsVaultError as error:
+                raise AnsibleError(
+                    "DevOps Secrets Vault lookup failure: %s" % error.message
+                )
+        return result
--- a/plugins/lookup/etcd.py
+++ b/plugins/lookup/etcd.py
@@ -54,13 +54,13 @@ DOCUMENTATION = '''

 EXAMPLES = '''
    - name: "a value from a locally running etcd"
-      debug: msg={{ lookup('etcd', 'foo/bar') }}
+      ansible.builtin.debug: msg={{ lookup('etcd', 'foo/bar') }}

    - name: "values from multiple folders on a locally running etcd"
-      debug: msg={{ lookup('etcd', 'foo', 'bar', 'baz') }}
+      ansible.builtin.debug: msg={{ lookup('etcd', 'foo', 'bar', 'baz') }}

    - name: "since Ansible 2.5 you can set server options inline"
-      debug: msg="{{ lookup('etcd', 'foo', version='v2', url='http://192.168.0.27:4001') }}"
+      ansible.builtin.debug: msg="{{ lookup('etcd', 'foo', version='v2', url='http://192.168.0.27:4001') }}"
 '''

 RETURN = '''
@@ -82,7 +82,7 @@ from ansible.module_utils.urls import open_url
 # If etcd  v2 running on host 192.168.1.21 on port 2379
 # we can use the following in a playbook to retrieve /tfm/network/config key
 #
-# - debug: msg={{lookup('etcd','/tfm/network/config', url='http://192.168.1.21:2379' , version='v2')}}
+# - ansible.builtin.debug: msg={{lookup('etcd','/tfm/network/config', url='http://192.168.1.21:2379' , version='v2')}}
 #
 # Example Output:
 #
--- a/plugins/lookup/etcd3.py
+++ b/plugins/lookup/etcd3.py
@@ -14,7 +14,7 @@ DOCUMENTATION = '''
    short_description: Get key values from etcd3 server
    description:
    - Retrieves key values and/or key prefixes from etcd3 server using its native gRPC API.
-    - Try to reuse M(etcd3) options for connection parameters, but add support for some C(ETCDCTL_*) environment variables.
+    - Try to reuse M(community.general.etcd3) options for connection parameters, but add support for some C(ETCDCTL_*) environment variables.
    - See U(https://github.com/etcd-io/etcd/tree/master/Documentation/op-guide) for etcd overview.

    options:
@@ -92,7 +92,7 @@ DOCUMENTATION = '''
    - The recommanded way to connect to etcd3 server is using C(ETCDCTL_ENDPOINT)
      environment variable and keep I(endpoints), I(host), and I(port) unused.
    seealso:
-    - module: etcd3
+    - module: community.general.etcd3
    - ref: etcd_lookup

    requirements:
@@ -101,19 +101,19 @@ DOCUMENTATION = '''

 EXAMPLES = '''
    - name: "a value from a locally running etcd"
-      debug:
+      ansible.builtin.debug:
        msg: "{{ lookup('community.general.etcd3', 'foo/bar') }}"

    - name: "values from multiple folders on a locally running etcd"
-      debug:
+      ansible.builtin.debug:
        msg: "{{ lookup('community.general.etcd3', 'foo', 'bar', 'baz') }}"

    - name: "look for a key prefix"
-      debug:
+      ansible.builtin.debug:
        msg: "{{ lookup('community.general.etcd3', '/foo/bar', prefix=True) }}"

    - name: "connect to etcd3 with a client certificate"
-      debug:
+      ansible.builtin.debug:
        msg: "{{ lookup('community.general.etcd3', 'foo/bar', cert_cert='/etc/ssl/etcd/client.pem', cert_key='/etc/ssl/etcd/client.key') }}"
 '''

--- a/plugins/lookup/filetree.py
+++ b/plugins/lookup/filetree.py
@@ -21,7 +21,7 @@ options:

 EXAMPLES = """
 - name: Create directories
-  file:
+  ansible.builtin.file:
    path: /web/{{ item.path }}
    state: directory
    mode: '{{ item.mode }}'
@@ -29,7 +29,7 @@ EXAMPLES = """
  when: item.state == 'directory'

 - name: Template files (explicitly skip directories in order to use the 'src' attribute)
-  template:
+  ansible.builtin.template:
    src: '{{ item.src }}'
    dest: /web/{{ item.path }}
    mode: '{{ item.mode }}'
@@ -37,7 +37,7 @@ EXAMPLES = """
  when: item.state == 'file'

 - name: Recreate symlinks
-  file:
+  ansible.builtin.file:
    src: '{{ item.src }}'
    dest: /web/{{ item.path }}
    state: link
--- a/plugins/lookup/flattened.py
+++ b/plugins/lookup/flattened.py
@@ -21,7 +21,7 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: "'unnest' all elements into single list"
-  debug: msg="all in one list {{lookup('flattened', [1,2,3,[5,6]], [a,b,c], [[5,6,1,3], [34,a,b,c]])}}"
+  ansible.builtin.debug: msg="all in one list {{lookup('flattened', [1,2,3,[5,6]], [a,b,c], [[5,6,1,3], [34,a,b,c]])}}"
 """

 RETURN = """
--- a/plugins/lookup/gcp_storage_file.py
+++ b/plugins/lookup/gcp_storage_file.py
@@ -29,7 +29,7 @@ extends_documentation_fragment:
 '''

 EXAMPLES = '''
- debug: msg="the value of foo.txt is {{ lookup('gcp_storage_file',
+- ansible.builtin.debug: msg="the value of foo.txt is {{ lookup('gcp_storage_file',
    bucket='gcp-bucket', src='mydir/foo.txt', project='project-name',
    auth_kind='serviceaccount', service_account_file='/tmp/myserviceaccountfile.json') }}"
 '''
--- a/plugins/lookup/hashi_vault.py
+++ b/plugins/lookup/hashi_vault.py
@@ -161,79 +161,79 @@ DOCUMENTATION = """
 """

 EXAMPLES = """
- debug:
+- ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hello:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200') }}"

 - name: Return all secrets from a path
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hello token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200') }}"

 - name: Vault that requires authentication via LDAP
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret/hello:value auth_method=ldap mount_point=ldap username=myuser password=mypas') }}"

 - name: Vault that requires authentication via username and password
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hello:value auth_method=userpass username=myuser password=psw url=http://myvault:8200') }}"

 - name: Using an ssl vault
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hola:value token=c975b780-d1be-8016-866b-01d0f9b688a5 validate_certs=False') }}"

 - name: using certificate auth
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret/hi:value token=xxxx url=https://myvault:8200 validate_certs=True cacert=/cacert/path/ca.pem') }}"

 - name: authenticate with a Vault app role
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hello:value auth_method=approle role_id=myroleid secret_id=mysecretid') }}"

 - name: Return all secrets from a path in a namespace
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/hello token=c975b780-d1be-8016-866b-01d0f9b688a5 namespace=teama/admins') }}"

 # When using KV v2 the PATH should include "data" between the secret engine mount and path (e.g. "secret/data/:path")
 # see: https://www.vaultproject.io/api/secret/kv/kv-v2.html#read-secret-version
 - name: Return latest KV v2 secret from path
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/data/hello token=my_vault_token url=http://myvault_url:8200') }}"

 # The following examples work in collection releases after community.general 0.2.0

 - name: secret= is not required if secret is first
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret/data/hello token=<token> url=http://myvault_url:8200') }}"

 - name: options can be specified as parameters rather than put in term string
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret/data/hello', token=my_token_var, url='http://myvault_url:8200') }}"

 # return_format (or its alias 'as') can control how secrets are returned to you
 - name: return secrets as a dict (default)
-  set_fact:
+  ansible.builtin.set_fact:
    my_secrets: "{{ lookup('community.general.hashi_vault', 'secret/data/manysecrets', token=my_token_var, url='http://myvault_url:8200') }}"
- debug:
+- ansible.builtin.debug:
    msg: "{{ my_secrets['secret_key'] }}"
- debug:
+- ansible.builtin.debug:
    msg: "Secret '{{ item.key }}' has value '{{ item.value }}'"
  loop: "{{ my_secrets | dict2items }}"

 - name: return secrets as values only
-  debug:
+  ansible.builtin.debug:
    msg: "A secret value: {{ item }}"
  loop: "{{ query('community.general.hashi_vault', 'secret/data/manysecrets', token=my_token_var, url='http://myvault_url:8200', return_format='values') }}"

 - name: return raw secret from API, including metadata
-  set_fact:
+  ansible.builtin.set_fact:
    my_secret: "{{ lookup('community.general.hashi_vault', 'secret/data/hello:value', token=my_token_var, url='http://myvault_url:8200', as='raw') }}"
- debug:
+- ansible.builtin.debug:
    msg: "This is version {{ my_secret['metadata']['version'] }} of hello:value. The secret data is {{ my_secret['data']['data']['value'] }}"

 # AWS IAM authentication method
 # uses Ansible standard AWS options

 - name: authenticate with aws_iam_login
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('community.general.hashi_vault', 'secret/hello:value', auth_method='aws_iam_login' role_id='myroleid', profile=my_boto_profile) }}"
 """

--- a/plugins/lookup/hiera.py
+++ b/plugins/lookup/hiera.py
@@ -39,13 +39,13 @@ EXAMPLES = """
 # All this examples depends on hiera.yml that describes the hierarchy

 - name: "a value from Hiera 'DB'"
-  debug: msg={{ lookup('hiera', 'foo') }}
+  ansible.builtin.debug: msg={{ lookup('hiera', 'foo') }}

 - name: "a value from a Hiera 'DB' on other environment"
-  debug: msg={{ lookup('hiera', 'foo environment=production') }}
+  ansible.builtin.debug: msg={{ lookup('hiera', 'foo environment=production') }}

 - name: "a value from a Hiera 'DB' for a concrete node"
-  debug: msg={{ lookup('hiera', 'foo fqdn=puppet01.localdomain') }}
+  ansible.builtin.debug: msg={{ lookup('hiera', 'foo fqdn=puppet01.localdomain') }}
 """

 RETURN = """
--- a/plugins/lookup/keyring.py
+++ b/plugins/lookup/keyring.py
@@ -18,7 +18,7 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name : output secrets to screen (BAD IDEA)
-  debug:
+  ansible.builtin.debug:
    msg: "Password: {{item}}"
  with_keyring:
    - 'servicename username'
--- a/plugins/lookup/lastpass.py
+++ b/plugins/lookup/lastpass.py
@@ -25,7 +25,7 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: get 'custom_field' from lastpass entry 'entry-name'
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('lastpass', 'entry-name', field='custom_field') }}"
 """

--- a/plugins/lookup/lmdb_kv.py
+++ b/plugins/lookup/lmdb_kv.py
@@ -24,11 +24,11 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: query LMDB for a list of country codes
-  debug:
+  ansible.builtin.debug:
    msg: "{{ query('lmdb_kv', 'nl', 'be', 'lu', db='jp.mdb') }}"

 - name: use list of values in a loop by key wildcard
-  debug:
+  ansible.builtin.debug:
    msg: "Hello from {{ item.0 }} a.k.a. {{ item.1 }}"
  vars:
    - lmdb_kv_db: jp.mdb
@@ -36,7 +36,7 @@ EXAMPLES = """
     - "n*"

 - name: get an item by key
-  assert:
+  ansible.builtin.assert:
    that:
      - item == 'Belgium'
    vars:
--- a/plugins/lookup/manifold.py
+++ b/plugins/lookup/manifold.py
@@ -40,11 +40,11 @@ DOCUMENTATION = '''

 EXAMPLES = '''
    - name: all available resources
-      debug: msg="{{ lookup('manifold', api_token='SecretToken') }}"
+      ansible.builtin.debug: msg="{{ lookup('manifold', api_token='SecretToken') }}"
    - name: all available resources for a specific project in specific team
-      debug: msg="{{ lookup('manifold', api_token='SecretToken', project='poject-1', team='team-2') }}"
+      ansible.builtin.debug: msg="{{ lookup('manifold', api_token='SecretToken', project='poject-1', team='team-2') }}"
    - name: two specific resources
-      debug: msg="{{ lookup('manifold', 'resource-1', 'resource-2') }}"
+      ansible.builtin.debug: msg="{{ lookup('manifold', 'resource-1', 'resource-2') }}"
 '''

 RETURN = '''
--- a/plugins/lookup/nios.py
+++ b/plugins/lookup/nios.py
@@ -47,11 +47,11 @@ options:

 EXAMPLES = """
 - name: fetch all networkview objects
-  set_fact:
+  ansible.builtin.set_fact:
    networkviews: "{{ lookup('nios', 'networkview', provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 - name: fetch the default dns view
-  set_fact:
+  ansible.builtin.set_fact:
    dns_views: "{{ lookup('nios', 'view', filter={'name': 'default'}, provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 # all of the examples below use credentials that are  set using env variables
@@ -60,20 +60,20 @@ EXAMPLES = """
 # export INFOBLOX_PASSWORD=admin

 - name: fetch all host records and include extended attributes
-  set_fact:
+  ansible.builtin.set_fact:
    host_records: "{{ lookup('nios', 'record:host', return_fields=['extattrs', 'name', 'view', 'comment']}) }}"


 - name: use env variables to pass credentials
-  set_fact:
+  ansible.builtin.set_fact:
    networkviews: "{{ lookup('nios', 'networkview') }}"

 - name: get a host record
-  set_fact:
+  ansible.builtin.set_fact:
    host: "{{ lookup('nios', 'record:host', filter={'name': 'hostname.ansible.com'}) }}"

 - name: get the authoritative zone from a non default dns view
-  set_fact:
+  ansible.builtin.set_fact:
    host: "{{ lookup('nios', 'zone_auth', filter={'fqdn': 'ansible.com', 'view': 'ansible-dns'}) }}"
 """

--- a/plugins/lookup/nios_next_ip.py
+++ b/plugins/lookup/nios_next_ip.py
@@ -47,15 +47,15 @@ options:

 EXAMPLES = """
 - name: return next available IP address for network 192.168.10.0/24
-  set_fact:
+  ansible.builtin.set_fact:
    ipaddr: "{{ lookup('nios_next_ip', '192.168.10.0/24', provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 - name: return the next 3 available IP addresses for network 192.168.10.0/24
-  set_fact:
+  ansible.builtin.set_fact:
    ipaddr: "{{ lookup('nios_next_ip', '192.168.10.0/24', num=3, provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 - name: return the next 3 available IP addresses for network 192.168.10.0/24 excluding ip addresses - ['192.168.10.1', '192.168.10.2']
-  set_fact:
+  ansible.builtin.set_fact:
    ipaddr: "{{ lookup('nios_next_ip', '192.168.10.0/24', num=3, exclude=['192.168.10.1', '192.168.10.2'],
                provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
 """
--- a/plugins/lookup/nios_next_network.py
+++ b/plugins/lookup/nios_next_network.py
@@ -55,16 +55,16 @@ options:

 EXAMPLES = """
 - name: return next available network for network-container 192.168.10.0/24
-  set_fact:
+  ansible.builtin.set_fact:
    networkaddr: "{{ lookup('nios_next_network', '192.168.10.0/24', cidr=25, provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 - name: return the next 2 available network addresses for network-container 192.168.10.0/24
-  set_fact:
+  ansible.builtin.set_fact:
    networkaddr: "{{ lookup('nios_next_network', '192.168.10.0/24', cidr=25, num=2,
                        provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"

 - name: return the available network addresses for network-container 192.168.10.0/24 excluding network range '192.168.10.0/25'
-  set_fact:
+  ansible.builtin.set_fact:
    networkaddr: "{{ lookup('nios_next_network', '192.168.10.0/24', cidr=25, exclude=['192.168.10.0/25'],
                        provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
 """
--- a/plugins/lookup/onepassword.py
+++ b/plugins/lookup/onepassword.py
@@ -55,26 +55,26 @@ DOCUMENTATION = '''
 EXAMPLES = """
 # These examples only work when already signed in to 1Password
 - name: Retrieve password for KITT when already signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword', 'KITT')

 - name: Retrieve password for Wintermute when already signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword', 'Tessier-Ashpool', section='Wintermute')

 - name: Retrieve username for HAL when already signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword', 'HAL 9000', field='username', vault='Discovery')

 - name: Retrieve password for HAL when not signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword'
                'HAL 9000'
                subdomain='Discovery'
                master_password=vault_master_password)

 - name: Retrieve password for HAL when never signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword'
                'HAL 9000'
                subdomain='Discovery'
--- a/plugins/lookup/onepassword_raw.py
+++ b/plugins/lookup/onepassword_raw.py
@@ -51,11 +51,11 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: Retrieve all data about Wintermute
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword_raw', 'Wintermute')

 - name: Retrieve all data about Wintermute when not signed in to 1Password
-  debug:
+  ansible.builtin.debug:
    var: lookup('onepassword_raw', 'Wintermute', subdomain='Turing', vault_password='DmbslfLvasjdl')
 """

--- a/plugins/lookup/passwordstore.py
+++ b/plugins/lookup/passwordstore.py
@@ -57,32 +57,32 @@ DOCUMENTATION = '''
 EXAMPLES = """
 # Debug is used for examples, BAD IDEA to show passwords on screen
 - name: Basic lookup. Fails if example/test doesn't exist
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('passwordstore', 'example/test')}}"

 - name: Create pass with random 16 character password. If password exists just give the password
-  debug:
+  ansible.builtin.debug:
    var: mypassword
  vars:
    mypassword: "{{ lookup('passwordstore', 'example/test create=true')}}"

 - name: Different size password
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('passwordstore', 'example/test create=true length=42')}}"

 - name: Create password and overwrite the password if it exists. As a bonus, this module includes the old password inside the pass file
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('passwordstore', 'example/test create=true overwrite=true')}}"

 - name: Create an alphanumeric password
-  debug: msg="{{ lookup('passwordstore', 'example/test create=true nosymbols=true') }}"
+  ansible.builtin.debug: msg="{{ lookup('passwordstore', 'example/test create=true nosymbols=true') }}"

 - name: Return the value for user in the KV pair user, username
-  debug:
+  ansible.builtin.debug:
    msg: "{{ lookup('passwordstore', 'example/test subkey=user')}}"

 - name: Return the entire password file content
-  set_fact:
+  ansible.builtin.set_fact:
    passfilecontent: "{{ lookup('passwordstore', 'example/test returnall=true')}}"
 """

--- a/plugins/lookup/redis.py
+++ b/plugins/lookup/redis.py
@@ -46,17 +46,17 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: query redis for somekey (default or configured settings used)
-  debug: msg="{{ lookup('redis', 'somekey') }}"
+  ansible.builtin.debug: msg="{{ lookup('redis', 'somekey') }}"

 - name: query redis for list of keys and non-default host and port
-  debug: msg="{{ lookup('redis', item, host='myredis.internal.com', port=2121) }}"
+  ansible.builtin.debug: msg="{{ lookup('redis', item, host='myredis.internal.com', port=2121) }}"
  loop: '{{list_of_redis_keys}}'

 - name: use list directly
-  debug: msg="{{ lookup('redis', 'key1', 'key2', 'key3') }}"
+  ansible.builtin.debug: msg="{{ lookup('redis', 'key1', 'key2', 'key3') }}"

 - name: use list directly with a socket
-  debug: msg="{{ lookup('redis', 'key1', 'key2', socket='/var/tmp/redis.sock') }}"
+  ansible.builtin.debug: msg="{{ lookup('redis', 'key1', 'key2', socket='/var/tmp/redis.sock') }}"

 """

--- a/plugins/lookup/shelvefile.py
+++ b/plugins/lookup/shelvefile.py
@@ -23,7 +23,7 @@ DOCUMENTATION = '''

 EXAMPLES = """
 - name: retrieve a string value corresponding to a key inside a Python shelve file
-  debug: msg="{{ lookup('shelvefile', 'file=path_to_some_shelve_file.db key=key_to_retrieve') }}
+  ansible.builtin.debug: msg="{{ lookup('shelvefile', 'file=path_to_some_shelve_file.db key=key_to_retrieve') }}
 """

 RETURN = """
--- a/plugins/lookup/tss.py
+++ b/plugins/lookup/tss.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+# Copyright: (c) 2020, Adam Migus <adam@migus.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+DOCUMENTATION = r"""
+lookup: tss
+author: Adam Migus (adam@migus.org)
+short_description: Get secrets from Thycotic Secret Server
+version_added: 1.0.0
+description:
+    - Uses the Thycotic Secret Server Python SDK to get Secrets from Secret
+      Server using token authentication with I(username) and I(password) on
+      the REST API at I(base_url).
+requirements:
+    - python-tss-sdk - https://pypi.org/project/python-tss-sdk/
+options:
+    _terms:
+        description: The integer ID of the secret.
+        required: true
+        type: int
+    base_url:
+        description: The base URL of the server, e.g. C(https://localhost/SecretServer).
+        env:
+            - name: TSS_BASE_URL
+        ini:
+            - section: tss_lookup
+              key: base_url
+        required: true
+    username:
+        description: The username with which to request the OAuth2 Access Grant.
+        env:
+            - name: TSS_USERNAME
+        ini:
+            - section: tss_lookup
+              key: username
+        required: true
+    password:
+        description: The password associated with the supplied username.
+        env:
+            - name: TSS_PASSWORD
+        ini:
+            - section: tss_lookup
+              key: password
+        required: true
+    api_path_uri:
+        default: /api/v1
+        description: The path to append to the base URL to form a valid REST
+            API request.
+        env:
+            - name: TSS_API_PATH_URI
+        required: false
+    token_path_uri:
+        default: /oauth2/token
+        description: The path to append to the base URL to form a valid OAuth2
+            Access Grant request.
+        env:
+            - name: TSS_TOKEN_PATH_URI
+        required: false
+"""
+
+RETURN = r"""
+_list:
+    description:
+        - The JSON responses to C(GET /secrets/{id}).
+        - See U(https://updates.thycotic.net/secretserver/restapiguide/TokenAuth/#operation--secrets--id--get).
+"""
+
+EXAMPLES = r"""
+- hosts: localhost
+  vars:
+      secret: "{{ lookup('community.general.tss', 1) }}"
+  tasks:
+      - ansible.builtin.debug: msg="the password is {{ (secret['items'] | items2dict(key_name='slug', value_name='itemValue'))['password'] }}"
+"""
+
+from ansible.errors import AnsibleError, AnsibleOptionsError
+
+sdk_is_missing = False
+
+try:
+    from thycotic.secrets.server import (
+        SecretServer,
+        SecretServerAccessError,
+        SecretServerError,
+    )
+except ImportError:
+    sdk_is_missing = True
+
+from ansible.utils.display import Display
+from ansible.plugins.lookup import LookupBase
+
+
+display = Display()
+
+
+class LookupModule(LookupBase):
+    @staticmethod
+    def Client(server_parameters):
+        return SecretServer(**server_parameters)
+
+    def run(self, terms, variables, **kwargs):
+        if sdk_is_missing:
+            raise AnsibleError("python-tss-sdk must be installed to use this plugin")
+
+        self.set_options(var_options=variables, direct=kwargs)
+
+        secret_server = LookupModule.Client(
+            {
+                "base_url": self.get_option("base_url"),
+                "username": self.get_option("username"),
+                "password": self.get_option("password"),
+                "api_path_uri": self.get_option("api_path_uri"),
+                "token_path_uri": self.get_option("token_path_uri"),
+            }
+        )
+        result = []
+
+        for term in terms:
+            display.debug("tss_lookup term: %s" % term)
+            try:
+                id = int(term)
+                display.vvv(u"Secret Server lookup of Secret with ID %d" % id)
+                result.append(secret_server.get_secret_json(id))
+            except ValueError:
+                raise AnsibleOptionsError("Secret ID must be an integer")
+            except SecretServerError as error:
+                raise AnsibleError("Secret Server lookup failure: %s" % error.message)
+        return result
--- a/plugins/module_utils/alicloud_ecs.py
+++ b/plugins/module_utils/alicloud_ecs.py
@@ -6,25 +6,10 @@
 #
 # Copyright (c) 2017-present Alibaba Group Holding Limited. He Guimin <heguimin36@163.com>
 #
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice,
-#      this list of conditions and the following disclaimer in the documentation
-#      and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type

 import os
 import json
--- a/plugins/module_utils/cloud.py
+++ b/plugins/module_utils/cloud.py
@@ -1,21 +1,12 @@
 #
 # (c) 2016 Allen Sanabria, <asanabria@linuxdynasty.org>
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
 """
 This module adds shared support for generic cloud modules

--- a/plugins/module_utils/compat/ipaddress.py
+++ b/plugins/module_utils/compat/ipaddress.py
@@ -60,7 +60,9 @@ and networks.

 """

+from __future__ import (absolute_import, division, print_function)
 from __future__ import unicode_literals
+__metaclass__ = type


 import itertools
--- a/plugins/module_utils/database.py
+++ b/plugins/module_utils/database.py
@@ -5,26 +5,11 @@
 # to the complete work.
 #
 # Copyright (c) 2014, Toshio Kuratomi <tkuratomi@ansible.com>
-# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice,
-#      this list of conditions and the following disclaimer in the documentation
-#      and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type

 import re

--- a/plugins/module_utils/digital_ocean.py
+++ b/plugins/module_utils/digital_ocean.py
@@ -1,147 +0,0 @@
-# This code is part of Ansible, but is an independent component.
-# This particular file snippet, and this file snippet only, is BSD licensed.
-# Modules you write using this snippet, which is embedded dynamically by Ansible
-# still belong to the author of the module, and may assign their own license
-# to the complete work.
-#
-# Copyright (c), Ansible Project 2017
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice,
-#      this list of conditions and the following disclaimer in the documentation
-#      and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import json
-import os
-from ansible.module_utils.urls import fetch_url
-from ansible.module_utils._text import to_text
-from ansible.module_utils.basic import env_fallback
-
-
-class Response(object):
-
-    def __init__(self, resp, info):
-        self.body = None
-        if resp:
-            self.body = resp.read()
-        self.info = info
-
-    @property
-    def json(self):
-        if not self.body:
-            if "body" in self.info:
-                return json.loads(to_text(self.info["body"]))
-            return None
-        try:
-            return json.loads(to_text(self.body))
-        except ValueError:
-            return None
-
-    @property
-    def status_code(self):
-        return self.info["status"]
-
-
-class DigitalOceanHelper:
-
-    def __init__(self, module):
-        self.module = module
-        self.baseurl = 'https://api.digitalocean.com/v2'
-        self.timeout = module.params.get('timeout', 30)
-        self.oauth_token = module.params.get('oauth_token')
-        self.headers = {'Authorization': 'Bearer {0}'.format(self.oauth_token),
-                        'Content-type': 'application/json'}
-
-        # Check if api_token is valid or not
-        response = self.get('account')
-        if response.status_code == 401:
-            self.module.fail_json(msg='Failed to login using API token, please verify validity of API token.')
-
-    def _url_builder(self, path):
-        if path[0] == '/':
-            path = path[1:]
-        return '%s/%s' % (self.baseurl, path)
-
-    def send(self, method, path, data=None):
-        url = self._url_builder(path)
-        data = self.module.jsonify(data)
-
-        resp, info = fetch_url(self.module, url, data=data, headers=self.headers, method=method, timeout=self.timeout)
-
-        return Response(resp, info)
-
-    def get(self, path, data=None):
-        return self.send('GET', path, data)
-
-    def put(self, path, data=None):
-        return self.send('PUT', path, data)
-
-    def post(self, path, data=None):
-        return self.send('POST', path, data)
-
-    def delete(self, path, data=None):
-        return self.send('DELETE', path, data)
-
-    @staticmethod
-    def digital_ocean_argument_spec():
-        return dict(
-            validate_certs=dict(type='bool', required=False, default=True),
-            oauth_token=dict(
-                no_log=True,
-                # Support environment variable for DigitalOcean OAuth Token
-                fallback=(env_fallback, ['DO_API_TOKEN', 'DO_API_KEY', 'DO_OAUTH_TOKEN', 'OAUTH_TOKEN']),
-                required=False,
-                aliases=['api_token'],
-            ),
-            timeout=dict(type='int', default=30),
-        )
-
-    def get_paginated_data(self, base_url=None, data_key_name=None, data_per_page=40, expected_status_code=200):
-        """
-        Function to get all paginated data from given URL
-        Args:
-            base_url: Base URL to get data from
-            data_key_name: Name of data key value
-            data_per_page: Number results per page (Default: 40)
-            expected_status_code: Expected returned code from DigitalOcean (Default: 200)
-        Returns: List of data
-
-        """
-        page = 1
-        has_next = True
-        ret_data = []
-        status_code = None
-        response = None
-        while has_next or status_code != expected_status_code:
-            required_url = "{0}page={1}&per_page={2}".format(base_url, page, data_per_page)
-            response = self.get(required_url)
-            status_code = response.status_code
-            # stop if any error during pagination
-            if status_code != expected_status_code:
-                break
-            page += 1
-            ret_data.extend(response.json[data_key_name])
-            has_next = "pages" in response.json["links"] and "next" in response.json["links"]["pages"]
-
-        if status_code != expected_status_code:
-            msg = "Failed to fetch %s from %s" % (data_key_name, base_url)
-            if response:
-                msg += " due to error : %s" % response.json['message']
-            self.module.fail_json(msg=msg)
-
-        return ret_data
--- a/plugins/module_utils/dimensiondata.py
+++ b/plugins/module_utils/dimensiondata.py
@@ -2,25 +2,17 @@
 #
 # Copyright (c) 2016 Dimension Data
 #
-# This module is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this software.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # Authors:
 #   - Aimon Bustardo <aimon.bustardo@dimensiondata.com>
 #   - Mark Maglana   <mmaglana@gmail.com>
 #   - Adam Friedman  <tintoy@tintoy.io>
 #
-# Common functionality to be used by versious module components
+# Common functionality to be used by various module components
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type

 import os
 import re
--- a/plugins/module_utils/firewalld.py
+++ b/plugins/module_utils/firewalld.py
@@ -1,316 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# (c) 2013-2018, Adam Miller (maxamillion@fedoraproject.org)
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-# Imports and info for sanity checking
-from distutils.version import LooseVersion
-
-FW_VERSION = None
-fw = None
-fw_offline = False
-import_failure = True
-try:
-    import firewall.config
-    FW_VERSION = firewall.config.VERSION
-
-    from firewall.client import FirewallClient
-    from firewall.client import FirewallClientZoneSettings
-    from firewall.errors import FirewallError
-    import_failure = False
-
-    try:
-        fw = FirewallClient()
-        fw.getDefaultZone()
-
-    except (AttributeError, FirewallError):
-        # Firewalld is not currently running, permanent-only operations
-        fw_offline = True
-
-        # Import other required parts of the firewalld API
-        #
-        # NOTE:
-        #  online and offline operations do not share a common firewalld API
-        try:
-            from firewall.core.fw_test import Firewall_test
-            fw = Firewall_test()
-        except (ModuleNotFoundError):
-            # In firewalld version 0.7.0 this behavior changed
-            from firewall.core.fw import Firewall
-            fw = Firewall(offline=True)
-
-        fw.start()
-except ImportError:
-    pass
-
-
-class FirewallTransaction(object):
-    """
-    FirewallTransaction
-
-    This is the base class for all firewalld transactions we might want to have
-    """
-
-    def __init__(self, module, action_args=(), zone=None, desired_state=None,
-                 permanent=False, immediate=False, enabled_values=None, disabled_values=None):
-        # type: (firewall.client, tuple, str, bool, bool, bool)
-        """
-        initializer the transaction
-
-        :module:          AnsibleModule, instance of AnsibleModule
-        :action_args:     tuple, args to pass for the action to take place
-        :zone:            str,  firewall zone
-        :desired_state:   str,  the desired state (enabled, disabled, etc)
-        :permanent:       bool, action should be permanent
-        :immediate:       bool, action should take place immediately
-        :enabled_values:  str[], acceptable values for enabling something (default: enabled)
-        :disabled_values: str[], acceptable values for disabling something (default: disabled)
-        """
-
-        self.module = module
-        self.fw = fw
-        self.action_args = action_args
-
-        if zone:
-            self.zone = zone
-        else:
-            if fw_offline:
-                self.zone = fw.get_default_zone()
-            else:
-                self.zone = fw.getDefaultZone()
-
-        self.desired_state = desired_state
-        self.permanent = permanent
-        self.immediate = immediate
-        self.fw_offline = fw_offline
-        self.enabled_values = enabled_values or ["enabled"]
-        self.disabled_values = disabled_values or ["disabled"]
-
-        # List of messages that we'll call module.fail_json or module.exit_json
-        # with.
-        self.msgs = []
-
-        # Allow for custom messages to be added for certain subclass transaction
-        # types
-        self.enabled_msg = None
-        self.disabled_msg = None
-
-    #####################
-    # exception handling
-    #
-    def action_handler(self, action_func, action_func_args):
-        """
-        Function to wrap calls to make actions on firewalld in try/except
-        logic and emit (hopefully) useful error messages
-        """
-
-        try:
-            return action_func(*action_func_args)
-        except Exception as e:
-
-            # If there are any commonly known errors that we should provide more
-            # context for to help the users diagnose what's wrong. Handle that here
-            if "INVALID_SERVICE" in "%s" % e:
-                self.msgs.append("Services are defined by port/tcp relationship and named as they are in /etc/services (on most systems)")
-
-            if len(self.msgs) > 0:
-                self.module.fail_json(
-                    msg='ERROR: Exception caught: %s %s' % (e, ', '.join(self.msgs))
-                )
-            else:
-                self.module.fail_json(msg='ERROR: Exception caught: %s' % e)
-
-    def get_fw_zone_settings(self):
-        if self.fw_offline:
-            fw_zone = self.fw.config.get_zone(self.zone)
-            fw_settings = FirewallClientZoneSettings(
-                list(self.fw.config.get_zone_config(fw_zone))
-            )
-        else:
-            fw_zone = self.fw.config().getZoneByName(self.zone)
-            fw_settings = fw_zone.getSettings()
-
-        return (fw_zone, fw_settings)
-
-    def update_fw_settings(self, fw_zone, fw_settings):
-        if self.fw_offline:
-            self.fw.config.set_zone_config(fw_zone, fw_settings.settings)
-        else:
-            fw_zone.update(fw_settings)
-
-    def get_enabled_immediate(self):
-        raise NotImplementedError
-
-    def get_enabled_permanent(self):
-        raise NotImplementedError
-
-    def set_enabled_immediate(self):
-        raise NotImplementedError
-
-    def set_enabled_permanent(self):
-        raise NotImplementedError
-
-    def set_disabled_immediate(self):
-        raise NotImplementedError
-
-    def set_disabled_permanent(self):
-        raise NotImplementedError
-
-    def run(self):
-        """
-        run
-
-        This function contains the "transaction logic" where as all operations
-        follow a similar pattern in order to perform their action but simply
-        call different functions to carry that action out.
-        """
-
-        self.changed = False
-
-        if self.immediate and self.permanent:
-            is_enabled_permanent = self.action_handler(
-                self.get_enabled_permanent,
-                self.action_args
-            )
-            is_enabled_immediate = self.action_handler(
-                self.get_enabled_immediate,
-                self.action_args
-            )
-            self.msgs.append('Permanent and Non-Permanent(immediate) operation')
-
-            if self.desired_state in self.enabled_values:
-                if not is_enabled_permanent or not is_enabled_immediate:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-                if not is_enabled_permanent:
-                    self.action_handler(
-                        self.set_enabled_permanent,
-                        self.action_args
-                    )
-                    self.changed = True
-                if not is_enabled_immediate:
-                    self.action_handler(
-                        self.set_enabled_immediate,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.enabled_msg:
-                    self.msgs.append(self.enabled_msg)
-
-            elif self.desired_state in self.disabled_values:
-                if is_enabled_permanent or is_enabled_immediate:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-                if is_enabled_permanent:
-                    self.action_handler(
-                        self.set_disabled_permanent,
-                        self.action_args
-                    )
-                    self.changed = True
-                if is_enabled_immediate:
-                    self.action_handler(
-                        self.set_disabled_immediate,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.disabled_msg:
-                    self.msgs.append(self.disabled_msg)
-
-        elif self.permanent and not self.immediate:
-            is_enabled = self.action_handler(
-                self.get_enabled_permanent,
-                self.action_args
-            )
-            self.msgs.append('Permanent operation')
-
-            if self.desired_state in self.enabled_values:
-                if not is_enabled:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-
-                    self.action_handler(
-                        self.set_enabled_permanent,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.enabled_msg:
-                    self.msgs.append(self.enabled_msg)
-
-            elif self.desired_state in self.disabled_values:
-                if is_enabled:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-
-                    self.action_handler(
-                        self.set_disabled_permanent,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.disabled_msg:
-                    self.msgs.append(self.disabled_msg)
-
-        elif self.immediate and not self.permanent:
-            is_enabled = self.action_handler(
-                self.get_enabled_immediate,
-                self.action_args
-            )
-            self.msgs.append('Non-permanent operation')
-
-            if self.desired_state in self.enabled_values:
-                if not is_enabled:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-
-                    self.action_handler(
-                        self.set_enabled_immediate,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.enabled_msg:
-                    self.msgs.append(self.enabled_msg)
-
-            elif self.desired_state in self.disabled_values:
-                if is_enabled:
-                    if self.module.check_mode:
-                        self.module.exit_json(changed=True)
-
-                    self.action_handler(
-                        self.set_disabled_immediate,
-                        self.action_args
-                    )
-                    self.changed = True
-                if self.changed and self.disabled_msg:
-                    self.msgs.append(self.disabled_msg)
-
-        return (self.changed, self.msgs)
-
-    @staticmethod
-    def sanity_check(module):
-        """
-        Perform sanity checking, version checks, etc
-
-        :module:    AnsibleModule instance
-        """
-
-        if FW_VERSION and fw_offline:
-            # Pre-run version checking
-            if LooseVersion(FW_VERSION) < LooseVersion("0.3.9"):
-                module.fail_json(msg='unsupported version of firewalld, offline operations require >= 0.3.9 - found: {0}'.format(FW_VERSION))
-        elif FW_VERSION and not fw_offline:
-            # Pre-run version checking
-            if LooseVersion(FW_VERSION) < LooseVersion("0.2.11"):
-                module.fail_json(msg='unsupported version of firewalld, requires >= 0.2.11 - found: {0}'.format(FW_VERSION))
-
-            # Check for firewalld running
-            try:
-                if fw.connected is False:
-                    module.fail_json(msg='firewalld service must be running, or try with offline=true')
-            except AttributeError:
-                module.fail_json(msg="firewalld connection can't be established,\
-                        installed version (%s) likely too old. Requires firewalld >= 0.2.11" % FW_VERSION)
-
-        if import_failure:
-            module.fail_json(
-                msg='Python Module not found: firewalld and its python module are required for this module, \
-                        version 0.2.11 or newer required (0.3.9 or newer for offline operations)'
-            )
--- a/Show More
+++ b/Show More