Add changelog.

.azure-pipelines/README.md

@@ -1,3 +0,0 @@
-## Azure Pipelines Configuration
-
-Please see the [Documentation](https://github.com/ansible/community/wiki/Testing:-Azure-Pipelines) for more information.

.azure-pipelines/azure-pipelines.yml

@@ -1,330 +0,0 @@
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - stable-*
-
-pr:
-  autoCancel: true
-  branches:
-    include:
-      - main
-      - stable-*
-
-schedules:
-  - cron: 0 8 * * *
-    displayName: Nightly (main)
-    always: true
-    branches:
-      include:
-        - main
-  - cron: 0 10 * * *
-    displayName: Nightly (active stable branches)
-    always: true
-    branches:
-      include:
-        - stable-3
-        - stable-4
-  - cron: 0 11 * * 0
-    displayName: Weekly (old stable branches)
-    always: true
-    branches:
-      include:
-        - stable-1
-        - stable-2
-
-variables:
-  - name: checkoutPath
-    value: ansible_collections/community/general
-  - name: coverageBranches
-    value: main
-  - name: pipelinesCoverage
-    value: coverage
-  - name: entryPoint
-    value: tests/utils/shippable/shippable.sh
-  - name: fetchDepth
-    value: 0
-
-resources:
-  containers:
-    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
-
-pool: Standard
-
-stages:
-### Sanity
-  - stage: Sanity_2_11
-    displayName: Sanity 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.11/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
-            - test: extra
-  - stage: Sanity_2_10
-    displayName: Sanity 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.10/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
-  - stage: Sanity_2_9
-    displayName: Sanity 2.9
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.9/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
-### Units
-  - stage: Units_2_11
-    displayName: Units 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.11/units/{0}/1
-          targets:
-            - test: 2.6
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-            - test: 3.9
-  - stage: Units_2_10
-    displayName: Units 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.10/units/{0}/1
-          targets:
-            - test: 2.6
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-            - test: 3.9
-  - stage: Units_2_9
-    displayName: Units 2.9
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.9/units/{0}/1
-          targets:
-            - test: 2.6
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-
-## Remote
-  - stage: Remote_2_11
-    displayName: Remote 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/{0}
-          targets:
-            - name: macOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.3
-              test: rhel/8.3
-            # - name: FreeBSD 11.4
-            #   test: freebsd/11.4
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Remote_2_10
-    displayName: Remote 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/{0}
-          targets:
-            - name: OS X 10.11
-              test: osx/10.11
-            - name: macOS 10.15
-              test: macos/10.15
-            - name: macOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.8
-              test: rhel/7.8
-            - name: RHEL 8.2
-              test: rhel/8.2
-            - name: FreeBSD 12.1
-              test: freebsd/12.1
-          groups:
-            - 1
-            - 2
-  - stage: Remote_2_9
-    displayName: Remote 2.9
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.9/{0}
-          targets:
-            - name: RHEL 8.2
-              test: rhel/8.2
-            - name: FreeBSD 12.0
-              test: freebsd/12.0
-          groups:
-            - 1
-            - 2
-
-### Docker
-  - stage: Docker_2_11
-    displayName: Docker 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/linux/{0}
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 32
-              test: fedora32
-            - name: Fedora 33
-              test: fedora33
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Docker_2_10
-    displayName: Docker 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/linux/{0}
-          targets:
-            - name: Fedora 32
-              test: fedora32
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-          groups:
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Docker_2_9
-    displayName: Docker 2.9
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.9/linux/{0}
-          targets:
-            - name: Fedora 31
-              test: fedora31
-            - name: openSUSE 15 py3
-              test: opensuse15
-          groups:
-            - 2
-            - 3
-            - 4
-            - 5
-
-### Cloud
-  - stage: Cloud_2_11
-    displayName: Cloud 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.11/cloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Cloud_2_10
-    displayName: Cloud 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.10/cloud/{0}/1
-          targets:
-            - test: 3.6
-  - stage: Cloud_2_9
-    displayName: Cloud 2.9
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.9/cloud/{0}/1
-          targets:
-            - test: 3.6
-  - stage: Summary
-    condition: succeededOrFailed()
-    dependsOn:
-      - Sanity_2_11
-      - Sanity_2_9
-      - Sanity_2_10
-      - Units_2_11
-      - Units_2_9
-      - Units_2_10
-      - Remote_2_11
-      - Remote_2_9
-      - Remote_2_10
-      - Docker_2_11
-      - Docker_2_9
-      - Docker_2_10
-      - Cloud_2_11
-      - Cloud_2_9
-      - Cloud_2_10
-    jobs:
-      - template: templates/coverage.yml

.azure-pipelines/scripts/aggregate-coverage.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Aggregate code coverage results for later processing.
-
-set -o pipefail -eu
-
-agent_temp_directory="$1"
-
-PATH="${PWD}/bin:${PATH}"
-
-mkdir "${agent_temp_directory}/coverage/"
-
-options=(--venv --venv-system-site-packages --color -v)
-
-ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}"
-
-if ansible-test coverage analyze targets generate --help >/dev/null 2>&1; then
-    # Only analyze coverage if the installed version of ansible-test supports it.
-    # Doing so allows this script to work unmodified for multiple Ansible versions.
-    ansible-test coverage analyze targets generate "${agent_temp_directory}/coverage/coverage-analyze-targets.json" "${options[@]}"
-fi

.azure-pipelines/scripts/combine-coverage.py

@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-"""
-Combine coverage data from multiple jobs, keeping the data only from the most recent attempt from each job.
-Coverage artifacts must be named using the format: "Coverage $(System.JobAttempt) {StableUniqueNameForEachJob}"
-The recommended coverage artifact name format is: Coverage $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)
-Keep in mind that Azure Pipelines does not enforce unique job display names (only names).
-It is up to pipeline authors to avoid name collisions when deviating from the recommended format.
-"""
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import os
-import re
-import shutil
-import sys
-
-
-def main():
-    """Main program entry point."""
-    source_directory = sys.argv[1]
-
-    if '/ansible_collections/' in os.getcwd():
-        output_path = "tests/output"
-    else:
-        output_path = "test/results"
-
-    destination_directory = os.path.join(output_path, 'coverage')
-
-    if not os.path.exists(destination_directory):
-        os.makedirs(destination_directory)
-
-    jobs = {}
-    count = 0
-
-    for name in os.listdir(source_directory):
-        match = re.search('^Coverage (?P<attempt>[0-9]+) (?P<label>.+)$', name)
-        label = match.group('label')
-        attempt = int(match.group('attempt'))
-        jobs[label] = max(attempt, jobs.get(label, 0))
-
-    for label, attempt in jobs.items():
-        name = 'Coverage {attempt} {label}'.format(label=label, attempt=attempt)
-        source = os.path.join(source_directory, name)
-        source_files = os.listdir(source)
-
-        for source_file in source_files:
-            source_path = os.path.join(source, source_file)
-            destination_path = os.path.join(destination_directory, source_file + '.' + label)
-            print('"%s" -> "%s"' % (source_path, destination_path))
-            shutil.copyfile(source_path, destination_path)
-            count += 1
-
-    print('Coverage file count: %d' % count)
-    print('##vso[task.setVariable variable=coverageFileCount]%d' % count)
-    print('##vso[task.setVariable variable=outputPath]%s' % output_path)
-
-
-if __name__ == '__main__':
-    main()

.azure-pipelines/scripts/process-results.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Check the test results and set variables for use in later steps.
-
-set -o pipefail -eu
-
-if [[ "$PWD" =~ /ansible_collections/ ]]; then
-    output_path="tests/output"
-else
-    output_path="test/results"
-fi
-
-echo "##vso[task.setVariable variable=outputPath]${output_path}"
-
-if compgen -G "${output_path}"'/junit/*.xml' > /dev/null; then
-    echo "##vso[task.setVariable variable=haveTestResults]true"
-fi
-
-if compgen -G "${output_path}"'/bot/ansible-test-*' > /dev/null; then
-    echo "##vso[task.setVariable variable=haveBotResults]true"
-fi
-
-if compgen -G "${output_path}"'/coverage/*' > /dev/null; then
-    echo "##vso[task.setVariable variable=haveCoverageData]true"
-fi

.azure-pipelines/scripts/publish-codecov.py

@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-"""
-Upload code coverage reports to codecov.io.
-Multiple coverage files from multiple languages are accepted and aggregated after upload.
-Python coverage, as well as PowerShell and Python stubs can all be uploaded.
-"""
-
-import argparse
-import dataclasses
-import pathlib
-import shutil
-import subprocess
-import tempfile
-import typing as t
-import urllib.request
-
-
-@dataclasses.dataclass(frozen=True)
-class CoverageFile:
-    name: str
-    path: pathlib.Path
-    flags: t.List[str]
-
-
-@dataclasses.dataclass(frozen=True)
-class Args:
-    dry_run: bool
-    path: pathlib.Path
-
-
-def parse_args() -> Args:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-n', '--dry-run', action='store_true')
-    parser.add_argument('path', type=pathlib.Path)
-
-    args = parser.parse_args()
-
-    # Store arguments in a typed dataclass
-    fields = dataclasses.fields(Args)
-    kwargs = {field.name: getattr(args, field.name) for field in fields}
-
-    return Args(**kwargs)
-
-
-def process_files(directory: pathlib.Path) -> t.Tuple[CoverageFile, ...]:
-    processed = []
-    for file in directory.joinpath('reports').glob('coverage*.xml'):
-        name = file.stem.replace('coverage=', '')
-
-        # Get flags from name
-        flags = name.replace('-powershell', '').split('=')  # Drop '-powershell' suffix
-        flags = [flag if not flag.startswith('stub') else flag.split('-')[0] for flag in flags]  # Remove "-01" from stub files
-
-        processed.append(CoverageFile(name, file, flags))
-
-    return tuple(processed)
-
-
-def upload_files(codecov_bin: pathlib.Path, files: t.Tuple[CoverageFile, ...], dry_run: bool = False) -> None:
-    for file in files:
-        cmd = [
-            str(codecov_bin),
-            '--name', file.name,
-            '--file', str(file.path),
-        ]
-        for flag in file.flags:
-            cmd.extend(['--flags', flag])
-
-        if dry_run:
-            print(f'DRY-RUN: Would run command: {cmd}')
-            continue
-
-        subprocess.run(cmd, check=True)
-
-
-def download_file(url: str, dest: pathlib.Path, flags: int, dry_run: bool = False) -> None:
-    if dry_run:
-        print(f'DRY-RUN: Would download {url} to {dest} and set mode to {flags:o}')
-        return
-
-    with urllib.request.urlopen(url) as resp:
-        with dest.open('w+b') as f:
-            # Read data in chunks rather than all at once
-            shutil.copyfileobj(resp, f, 64 * 1024)
-
-    dest.chmod(flags)
-
-
-def main():
-    args = parse_args()
-    url = 'https://ansible-ci-files.s3.amazonaws.com/codecov/linux/codecov'
-    with tempfile.TemporaryDirectory(prefix='codecov-') as tmpdir:
-        codecov_bin = pathlib.Path(tmpdir) / 'codecov'
-        download_file(url, codecov_bin, 0o755, args.dry_run)
-
-        files = process_files(args.path)
-        upload_files(codecov_bin, files, args.dry_run)
-
-
-if __name__ == '__main__':
-    main()

.azure-pipelines/scripts/report-coverage.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# Generate code coverage reports for uploading to Azure Pipelines and codecov.io.
-
-set -o pipefail -eu
-
-PATH="${PWD}/bin:${PATH}"
-
-if ! ansible-test --help >/dev/null 2>&1; then
-    # Install the devel version of ansible-test for generating code coverage reports.
-    # This is only used by Ansible Collections, which are typically tested against multiple Ansible versions (in separate jobs).
-    # Since a version of ansible-test is required that can work the output from multiple older releases, the devel version is used.
-    pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
-fi
-
-ansible-test coverage xml --group-by command --stub --venv --venv-system-site-packages --color -v

.azure-pipelines/scripts/run-tests.sh

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-# Configure the test environment and run the tests.
-
-set -o pipefail -eu
-
-entry_point="$1"
-test="$2"
-read -r -a coverage_branches <<< "$3"  # space separated list of branches to run code coverage on for scheduled builds
-
-export COMMIT_MESSAGE
-export COMPLETE
-export COVERAGE
-export IS_PULL_REQUEST
-
-if [ "${SYSTEM_PULLREQUEST_TARGETBRANCH:-}" ]; then
-    IS_PULL_REQUEST=true
-    COMMIT_MESSAGE=$(git log --format=%B -n 1 HEAD^2)
-else
-    IS_PULL_REQUEST=
-    COMMIT_MESSAGE=$(git log --format=%B -n 1 HEAD)
-fi
-
-COMPLETE=
-COVERAGE=
-
-if [ "${BUILD_REASON}" = "Schedule" ]; then
-    COMPLETE=yes
-
-    if printf '%s\n' "${coverage_branches[@]}" | grep -q "^${BUILD_SOURCEBRANCHNAME}$"; then
-        COVERAGE=yes
-    fi
-fi
-
-"${entry_point}" "${test}" 2>&1 | "$(dirname "$0")/time-command.py"

.azure-pipelines/scripts/time-command.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-"""Prepends a relative timestamp to each input line from stdin and writes it to stdout."""
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import sys
-import time
-
-
-def main():
-    """Main program entry point."""
-    start = time.time()
-
-    sys.stdin.reconfigure(errors='surrogateescape')
-    sys.stdout.reconfigure(errors='surrogateescape')
-
-    for line in sys.stdin:
-        seconds = time.time() - start
-        sys.stdout.write('%02d:%02d %s' % (seconds // 60, seconds % 60, line))
-        sys.stdout.flush()
-
-
-if __name__ == '__main__':
-    main()

.azure-pipelines/templates/coverage.yml

@@ -1,39 +0,0 @@
-# This template adds a job for processing code coverage data.
-# It will upload results to Azure Pipelines and codecov.io.
-# Use it from a job stage that completes after all other jobs have completed.
-# This can be done by placing it in a separate summary stage that runs after the test stage(s) have completed.
-
-jobs:
-  - job: Coverage
-    displayName: Code Coverage
-    container: default
-    workspace:
-      clean: all
-    steps:
-      - checkout: self
-        fetchDepth: $(fetchDepth)
-        path: $(checkoutPath)
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Coverage Data
-        inputs:
-          path: coverage/
-          patterns: "Coverage */*=coverage.combined"
-      - bash: .azure-pipelines/scripts/combine-coverage.py coverage/
-        displayName: Combine Coverage Data
-      - bash: .azure-pipelines/scripts/report-coverage.sh
-        displayName: Generate Coverage Report
-        condition: gt(variables.coverageFileCount, 0)
-      - task: PublishCodeCoverageResults@1
-        inputs:
-          codeCoverageTool: Cobertura
-          # Azure Pipelines only accepts a single coverage data file.
-          # That means only Python or PowerShell coverage can be uploaded, but not both.
-          # Set the "pipelinesCoverage" variable to determine which type is uploaded.
-          # Use "coverage" for Python and "coverage-powershell" for PowerShell.
-          summaryFileLocation: "$(outputPath)/reports/$(pipelinesCoverage).xml"
-        displayName: Publish to Azure Pipelines
-        condition: gt(variables.coverageFileCount, 0)
-      - bash: .azure-pipelines/scripts/publish-codecov.py "$(outputPath)"
-        displayName: Publish to codecov.io
-        condition: gt(variables.coverageFileCount, 0)
-        continueOnError: true

.azure-pipelines/templates/matrix.yml

@@ -1,55 +0,0 @@
-# This template uses the provided targets and optional groups to generate a matrix which is then passed to the test template.
-# If this matrix template does not provide the required functionality, consider using the test template directly instead.
-
-parameters:
-  # A required list of dictionaries, one per test target.
-  # Each item in the list must contain a "test" or "name" key.
-  # Both may be provided. If one is omitted, the other will be used.
-  - name: targets
-    type: object
-
-  # An optional list of values which will be used to multiply the targets list into a matrix.
-  # Values can be strings or numbers.
-  - name: groups
-    type: object
-    default: []
-
-  # An optional format string used to generate the job name.
-  # - {0} is the name of an item in the targets list.
-  - name: nameFormat
-    type: string
-    default: "{0}"
-
-  # An optional format string used to generate the test name.
-  # - {0} is the name of an item in the targets list.
-  - name: testFormat
-    type: string
-    default: "{0}"
-
-  # An optional format string used to add the group to the job name.
-  # {0} is the formatted name of an item in the targets list.
-  # {{1}} is the group -- be sure to include the double "{{" and "}}".
-  - name: nameGroupFormat
-    type: string
-    default: "{0} - {{1}}"
-
-  # An optional format string used to add the group to the test name.
-  # {0} is the formatted test of an item in the targets list.
-  # {{1}} is the group -- be sure to include the double "{{" and "}}".
-  - name: testGroupFormat
-    type: string
-    default: "{0}/{{1}}"
-
-jobs:
-  - template: test.yml
-    parameters:
-      jobs:
-        - ${{ if eq(length(parameters.groups), 0) }}:
-          - ${{ each target in parameters.targets }}:
-            - name: ${{ format(parameters.nameFormat, coalesce(target.name, target.test)) }}
-              test: ${{ format(parameters.testFormat, coalesce(target.test, target.name)) }}
-        - ${{ if not(eq(length(parameters.groups), 0)) }}:
-          - ${{ each group in parameters.groups }}:
-            - ${{ each target in parameters.targets }}:
-              - name: ${{ format(format(parameters.nameGroupFormat, parameters.nameFormat), coalesce(target.name, target.test), group) }}
-                test: ${{ format(format(parameters.testGroupFormat, parameters.testFormat), coalesce(target.test, target.name), group) }}

.azure-pipelines/templates/test.yml

@@ -1,45 +0,0 @@
-# This template uses the provided list of jobs to create test one or more test jobs.
-# It can be used directly if needed, or through the matrix template.
-
-parameters:
-  # A required list of dictionaries, one per test job.
-  # Each item in the list must contain a "job" and "name" key.
-  - name: jobs
-    type: object
-
-jobs:
-  - ${{ each job in parameters.jobs }}:
-    - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
-      displayName: ${{ job.name }}
-      container: default
-      workspace:
-        clean: all
-      steps:
-        - checkout: self
-          fetchDepth: $(fetchDepth)
-          path: $(checkoutPath)
-        - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)"
-          displayName: Run Tests
-        - bash: .azure-pipelines/scripts/process-results.sh
-          condition: succeededOrFailed()
-          displayName: Process Results
-        - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
-          condition: eq(variables.haveCoverageData, 'true')
-          displayName: Aggregate Coverage Data
-        - task: PublishTestResults@2
-          condition: eq(variables.haveTestResults, 'true')
-          inputs:
-            testResultsFiles: "$(outputPath)/junit/*.xml"
-          displayName: Publish Test Results
-        - task: PublishPipelineArtifact@1
-          condition: eq(variables.haveBotResults, 'true')
-          displayName: Publish Bot Results
-          inputs:
-            targetPath: "$(outputPath)/bot/"
-            artifactName: "Bot $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"
-        - task: PublishPipelineArtifact@1
-          condition: eq(variables.haveCoverageData, 'true')
-          displayName: Publish Coverage Data
-          inputs:
-            targetPath: "$(Agent.TempDirectory)/coverage/"
-            artifactName: "Coverage $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"

.github/patchback.yml

@@ -1,5 +0,0 @@
----
-backport_branch_prefix: patchback/backports/
-backport_label_prefix: backport-
-target_branch_prefix: stable-
-...

.github/workflows/codeql-analysis.yml

@@ -1,49 +0,0 @@
-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

.gitignore

@@ -1,6 +1,6 @@
 
-# Created by https://www.toptal.com/developers/gitignore/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
-# Edit at https://www.toptal.com/developers/gitignore?templates=git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# Created by https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# Edit at https://www.gitignore.io/?templates=git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
 
 ### dotenv ###
 .env
@@ -88,7 +88,7 @@ flycheck_*.el
 .nfs*
 
 ### PyCharm+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -98,9 +98,6 @@ flycheck_*.el
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS User-specific
-.idea/**/aws.xml
-
 # Generated files
 .idea/**/contentModel.xml
 
@@ -121,9 +118,6 @@ flycheck_*.el
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -204,6 +198,7 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -230,25 +225,13 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
-*.py,cover
 .hypothesis/
 .pytest_cache/
-cover/
 
 # Translations
 *.mo
 *.pot
 
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
 # Scrapy stuff:
 .scrapy
 
@@ -256,19 +239,9 @@ instance/
 docs/_build/
 
 # PyBuilder
-.pybuilder/
 target/
 
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
 # pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
 .python-version
 
 # pipenv
@@ -278,24 +251,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
+# celery beat schedule file
 celerybeat-schedule
-celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
 
-# Environments
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -303,6 +264,10 @@ venv.bak/
 # Rope project settings
 .ropeproject
 
+# Mr Developer
+.mr.developer.cfg
+.project
+
 # mkdocs documentation
 /site
 
@@ -314,16 +279,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
 ### Vim ###
 # Swap
 [._]*.s[a-v][a-z]
-!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
@@ -341,13 +299,11 @@ tags
 [._]*.un~
 
 ### WebStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
 
-# AWS User-specific
-
 # Generated files
 
 # Sensitive or high-churn files
@@ -358,9 +314,6 @@ tags
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -396,27 +349,15 @@ tags
 # *.ipr
 
 # Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
 .idea/**/sonarlint/
 
 # SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
 .idea/**/sonarIssues.xml
 
 # Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
 .idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
 .idea/**/markdown-navigator/
 
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
-
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db
@@ -443,4 +384,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# End of https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv

CONTRIBUTING.md

@@ -1,32 +0,0 @@
-# Contributing
-
-We follow [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html) in all our contributions and interactions within this repository.
-
-If you are a committer, also refer to the [collection's committer guidelines](https://github.com/ansible-collections/community.general/blob/main/commit-rights.md).
-
-## Issue tracker
-
-Whether you are looking for an opportunity to contribute or you found a bug and already know how to solve it, please go to the [issue tracker](https://github.com/ansible-collections/community.general/issues).
-There you can find feature ideas to implement, reports about bugs to solve, or submit an issue to discuss your idea before implementing it which can help choose a right direction at the beginning of your work and potentially save a lot of time and effort.
-Also somebody may already have started discussing or working on implementing the same or a similar idea,
-so you can cooperate to create a better solution together.
-
-* If you are interested in starting with an easy issue, look for [issues with an `easyfix` label](https://github.com/ansible-collections/community.general/labels/easyfix).
-* Often issues that are waiting for contributors to pick up have [the `waiting_on_contributor` label](https://github.com/ansible-collections/community.general/labels/waiting_on_contributor).
-
-## Open pull requests
-
-Look through currently [open pull requests](https://github.com/ansible-collections/community.general/pulls).
-You can help by reviewing them. Reviews help move pull requests to merge state. Some good pull requests cannot be merged only due to a lack of reviews. And it is always worth saying that good reviews are often more valuable than pull requests themselves.
-Note that reviewing does not only mean code review, but also offering comments on new interfaces added to existing plugins/modules, interfaces of new plugins/modules, improving language (not everyone is a native english speaker), or testing bugfixes and new features!
-
-Also, consider taking up a valuable, reviewed, but abandoned pull request which you could politely ask the original authors to complete yourself.
-
-* Try committing your changes with an informative but short commit message.
-* Do not squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
-* Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the respository checkout.
-* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#changelogs-how-to). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
-
-You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).
-
-If you find any inconsistencies or places in this document which can be improved, feel free to raise an issue or pull request to fix it.

README.md

@@ -1,27 +1,15 @@
 # Community General Collection
 
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-1)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
-[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)
+[![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. The collection includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.
+This repo contains the `community.general` Ansible Collection.
 
-You can find [documentation for this collection on the Ansible docs site](https://docs.ansible.com/ansible/latest/collections/community/general/).
+The collection includes the modules and plugins supported by Ansible community.
 
-Please note that this collection does **not** support Windows targets. Only connection plugins included in this collection might support Windows targets, and will explicitly mention that in their documentation if they do so.
 
-## Tested with Ansible
+## Installation and Usage
 
-Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases. Ansible versions before 2.9.10 are not supported.
-
-## External requirements
-
-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) or the [documentation on the Ansible docs site](https://docs.ansible.com/ansible/latest/collections/community/general/).
-
-## Using this collection
+### Installing the Collection from Ansible Galaxy
 
 Before using the General community collection, you need to install the collection with the `ansible-galaxy` CLI:
 
@@ -34,42 +22,21 @@ collections:
 - name: community.general
 ```
 
-See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
+## Testing and Development
 
-## Contributing to this collection
+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.
 
-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.
+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)
 
-For example, if you are working in the `~/dev` directory:
-
-```
-cd ~/dev
-git clone git@github.com:ansible-collections/community.general.git collections/ansible_collections/community/general
-export COLLECTIONS_PATH=$(pwd)/collections:$COLLECTIONS_PATH
-```
-
-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).
-
-Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md).
-
-### Running tests
+### Testing with `ansible-test`
 
 See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).
 
-### Communication
+## Release notes
 
-We have a dedicated Working Group for Ansible development.
+See [here](https://github.com/ansible-collections/community.general/tree/main/CHANGELOG.rst).
 
-You can find other people interested on the following [Libera.chat](https://libera.chat/) IRC channels -
-- `#ansible` - For general use questions and support.
-- `#ansible-devel` - For discussions on developer topics and code related to features or bugs in ansible-core.
-- `#ansible-community` - For discussions on community topics and community meetings, and for general development questions for community collections.
-
-For more information about communities, meetings and agendas see [Community Wiki](https://github.com/ansible/community/wiki/Community).
-
-For more information about [communication](https://docs.ansible.com/ansible/latest/community/communication.html)
-
-### Publishing New Version
+## Publishing New Version
 
 Basic instructions without release branches:
 
@@ -78,25 +45,25 @@ Basic instructions without release branches:
 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
+## More Information
 
-See the [changelog](https://github.com/ansible-collections/community.general/blob/main/CHANGELOG.rst).
+TBD
 
-## Roadmap
+## Communication
 
-See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning and deprecation.
+We have a dedicated Working Group for Ansible development.
 
-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.
+You can find other people interested on the following Freenode IRC channels -
+- `#ansible` - For general use questions and support.
+- `#ansible-devel` - For discussions on developer topics and code related to features or bugs.
+- `#ansible-community` - For discussions on community topics and community meetings.
 
-## More information
+For more information about communities, meetings and agendas see [Community Wiki](https://github.com/ansible/community/wiki/Community).
 
-- [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)
+For more information about [communication](https://docs.ansible.com/ansible/latest/community/communication.html)
 
-## Licensing
+## License
 
-GNU General Public License v3.0 or later.
+GNU General Public License v3.0 or later
 
-See [COPYING](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
+See [LICENSE](COPYING) to see the full text.

changelogs/config.yaml

@@ -4,7 +4,6 @@ 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

commit-rights.md

@@ -1,73 +0,0 @@
-Committers Guidelines for community.general
-===========================================
-
-This document is based on the [Ansible committer guidelines](https://github.com/ansible/ansible/blob/b57444af14062ec96e0af75fdfc2098c74fe2d9a/docs/docsite/rst/community/committer_guidelines.rst) ([latest version](https://docs.ansible.com/ansible/devel/community/committer_guidelines.html)).
-
-These are the guidelines for people with commit privileges on the Ansible Community General Collection GitHub repository. Please read the guidelines before you commit.
-
-These guidelines apply to everyone. At the same time, this is NOT a process document. So just use good judgment. You have been given commit access because we trust your judgment.
-
-That said, use the trust wisely.
-
-If you abuse the trust and break components and builds, and so on, the trust level falls and you may be asked not to commit or you may lose your commit privileges.
-
-Our workflow on GitHub
-----------------------
-
-As a committer, you may already know this, but our workflow forms a lot of our team policies. Please ensure you are aware of the following workflow steps:
-
-* Fork the repository upon which you want to do some work to your own personal repository
-* Work on the specific branch upon which you need to commit
-* Create a Pull Request back to the collection repository and await reviews
-* Adjust code as necessary based on the Comments provided
-* Ask someone from the other committers to do a final review and merge
-
-Sometimes, committers merge their own pull requests. This section is a set of guidelines. If you are changing a comma in a doc or making a very minor change, you can use your best judgement. This is another trust thing. The process is critical for any major change, but for little things or getting something done quickly, use your best judgement and make sure people on the team are aware of your work.
-
-Roles
------
-* Release managers: Merge pull requests to `stable-X` branches, create tags to do releases.
-* Committers: Fine to do PRs for most things, but we should have a timebox. Hanging PRs may merge on the judgement of these devs.
-* Module maintainers: Module maintainers own specific modules and have indirect commit access through the current module PR mechanisms. This is primary [ansibullbot](https://github.com/ansibullbot)'s `shipit` mechanism.
-
-General rules
--------------
-Individuals with direct commit access to this collection repository are entrusted with powers that allow them to do a broad variety of things--probably more than we can write down. Rather than rules, treat these as general *guidelines*, individuals with this power are expected to use their best judgement.
-
-* Do NOTs:
-
-  - Do not commit directly.
-  - Do not merge your own PRs. Someone else should have a chance to review and approve the PR merge. You have a small amount of leeway here for very minor changes.
-  - Do not forget about non-standard / alternate environments. Consider the alternatives. Yes, people have bad/unusual/strange environments (like binaries from multiple init systems installed), but they are the ones who need us the most.
-  - Do not drag your community team members down. Discuss the technical merits of any pull requests you review. Avoid negativity and personal comments. For more guidance on being a good community member, read the [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).
-  - Do not forget about the maintenance burden. High-maintenance features may not be worth adding.
-  - Do not break playbooks. Always keep backwards compatibility in mind.
-  - Do not forget to keep it simple. Complexity breeds all kinds of problems.
-  - Do not merge to branches other than `main`, especially not to `stable-X`, if you do not have explicit permission to do so.
-  - Do not create tags. Tags are used in the release process, and should only be created by the people responsible for managing the stable branches.
-
-* Do:
-
-  - Squash, avoid merges whenever possible, use GitHub's squash commits or cherry pick if needed (bisect thanks you).
-  - Be active. Committers who have no activity on the project (through merges, triage, commits, and so on) will have their permissions suspended.
-  - Consider backwards compatibility (goes back to "do not break existing playbooks").
-  - Write tests. PRs with tests are looked at with more priority than PRs without tests that should have them included. While not all changes require tests, be sure to add them for bug fixes or functionality changes.
-  - Discuss with other committers, specially when you are unsure of something.
-  - Document! If your PR is a new feature or a change to behavior, make sure you've updated all associated documentation or have notified the right people to do so.
-  - Consider scope, sometimes a fix can be generalized.
-  - Keep it simple, then things are maintainable, debuggable and intelligible.
-
-Committers are expected to continue to follow the same community and contribution guidelines followed by the rest of the Ansible community.
-
-
-People
-------
-
-Individuals who have been asked to become a part of this group have generally been contributing in significant ways to the community.general collection for some time. Should they agree, they are requested to add their names and GitHub IDs to this file, in the section below, through a pull request. Doing so indicates that these individuals agree to act in the ways that their fellow committers trust that they will act.
-
-| Name                | GitHub ID            | IRC Nick           | Other                |
-| ------------------- | -------------------- | ------------------ | -------------------- |
-| Alexei Znamensky    | russoz               | russoz             |                      |
-| Andrew Klychkov     | andersson007         | andersson007_      |                      |
-| Felix Fontein       | felixfontein         | felixfontein       |                      |
-| John R Barker       | gundalow             | gundalow           |                      |

galaxy.yml

@@ -1,19 +1,20 @@
 namespace: community
 name: general
-version: 1.3.14
+version: 0.2.1
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)
 description: null
 license_file: COPYING
-tags: [community]
+tags: null
 # NOTE: No more dependencies can be added to this list
 dependencies:
-  ansible.netcommon: '>=1.0.0'
-  community.kubernetes: '>=1.0.0,<2.0.0'
-  google.cloud: '>=1.0.0'
+  ansible.netcommon: '>=0.0.2'
+  ansible.posix: '>=0.1.0'
+  community.kubernetes: '>=0.1.0'
+  google.cloud: '>=0.0.9'
 repository: https://github.com/ansible-collections/community.general
-documentation: https://docs.ansible.com/ansible/latest/collections/community/general/
+#documentation: https://github.com/ansible-collection-migration/community.general/tree/main/docs
 homepage: https://github.com/ansible-collections/community.general
 issues: https://github.com/ansible-collections/community.general/issues
 #type: flatmap

meta/runtime.yml

@@ -56,13 +56,8 @@ 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:
@@ -71,173 +66,59 @@ plugin_routing:
     digital_ocean:
       deprecation:
         removal_version: 2.0.0
-        warning_text: The digital_ocean module has been moved to the community.digitalocean collection.
-      redirect: community.digitalocean.digital_ocean
+        warning_text: see plugin documentation for details
     digital_ocean_account_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_certificate_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_domain_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_firewall_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_floating_ip_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_image_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_load_balancer_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_region_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_size_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_snapshot_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_sshkey_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_tag_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     digital_ocean_volume_facts:
       deprecation:
-        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
+        removal_version: 3.0.0
+        warning_text: see plugin documentation for details
     docker_image_facts:
       deprecation:
         removal_version: 2.0.0
@@ -246,15 +127,6 @@ 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
@@ -267,18 +139,6 @@ 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
@@ -295,72 +155,10 @@ 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
@@ -369,113 +167,7 @@ plugin_routing:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
-    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:
+    ovirt:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
@@ -487,7 +179,7 @@ plugin_routing:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
-    ovirt:
+    one_image_facts:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
@@ -587,57 +279,6 @@ 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
@@ -666,6 +307,118 @@ 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
@@ -686,70 +439,23 @@ plugin_routing:
       deprecation:
         removal_version: 2.0.0
         warning_text: see plugin documentation for details
-    smartos_image_facts:
+    purefa_facts:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
-    vertica_facts:
+    purefb_facts:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
-    xenserver_guest_facts:
+    python_requirements_facts:
       deprecation:
         removal_version: 3.0.0
         warning_text: see plugin documentation for details
-  doc_fragments:
-    digital_ocean:
+    jenkins_job_facts:
       deprecation:
-        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: 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
-  callback:
-    actionable:
-      deprecation:
-        removal_version: 2.0.0
+        removal_version: 3.0.0
         warning_text: see plugin documentation for details
-    full_skip:
+    nginx_status_facts:
       deprecation:
-        removal_version: 2.0.0
-        warning_text: see plugin documentation for details
-    stderr:
-      deprecation:
-        removal_version: 2.0.0
+        removal_version: 3.0.0
         warning_text: see plugin documentation for details

plugins/action/iptables_state.py

@@ -1 +0,0 @@
-./system/iptables_state.py

plugins/action/shutdown.py

@@ -1 +0,0 @@
-./system/shutdown.py

plugins/action/system/iptables_state.py

@@ -1,198 +0,0 @@
-# Copyright: (c) 2020, quidame <quidame@poivron.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
-
-import time
-
-from ansible.plugins.action import ActionBase
-from ansible.errors import AnsibleError, AnsibleActionFail, AnsibleConnectionFailure
-from ansible.utils.vars import merge_hash
-from ansible.utils.display import Display
-
-display = Display()
-
-
-class ActionModule(ActionBase):
-
-    # Keep internal params away from user interactions
-    _VALID_ARGS = frozenset(('path', 'state', 'table', 'noflush', 'counters', 'modprobe', 'ip_version', 'wait'))
-    DEFAULT_SUDOABLE = True
-
-    MSG_ERROR__ASYNC_AND_POLL_NOT_ZERO = (
-        "This module doesn't support async>0 and poll>0 when its 'state' param "
-        "is set to 'restored'. To enable its rollback feature (that needs the "
-        "module to run asynchronously on the remote), please set task attribute "
-        "'poll' (=%s) to 0, and 'async' (=%s) to a value >2 and not greater than "
-        "'ansible_timeout' (=%s) (recommended).")
-    MSG_WARNING__NO_ASYNC_IS_NO_ROLLBACK = (
-        "Attempts to restore iptables state without rollback in case of mistake "
-        "may lead the ansible controller to loose access to the hosts and never "
-        "regain it before fixing firewall rules through a serial console, or any "
-        "other way except SSH. Please set task attribute 'poll' (=%s) to 0, and "
-        "'async' (=%s) to a value >2 and not greater than 'ansible_timeout' (=%s) "
-        "(recommended).")
-    MSG_WARNING__ASYNC_GREATER_THAN_TIMEOUT = (
-        "You attempt to restore iptables state with rollback in case of mistake, "
-        "but with settings that will lead this rollback to happen AFTER that the "
-        "controller will reach its own timeout. Please set task attribute 'poll' "
-        "(=%s) to 0, and 'async' (=%s) to a value >2 and not greater than "
-        "'ansible_timeout' (=%s) (recommended).")
-
-    def _async_result(self, module_args, task_vars, timeout):
-        '''
-        Retrieve results of the asynchonous task, and display them in place of
-        the async wrapper results (those with the ansible_job_id key).
-        '''
-        # At least one iteration is required, even if timeout is 0.
-        for i in range(max(1, timeout)):
-            async_result = self._execute_module(
-                module_name='ansible.builtin.async_status',
-                module_args=module_args,
-                task_vars=task_vars,
-                wrap_async=False)
-            if async_result['finished'] == 1:
-                break
-            time.sleep(min(1, timeout))
-
-        return async_result
-
-    def run(self, tmp=None, task_vars=None):
-
-        self._supports_check_mode = True
-        self._supports_async = True
-
-        result = super(ActionModule, self).run(tmp, task_vars)
-        del tmp  # tmp no longer has any effect
-
-        if not result.get('skipped'):
-
-            # FUTURE: better to let _execute_module calculate this internally?
-            wrap_async = self._task.async_val and not self._connection.has_native_async
-
-            # Set short names for values we'll have to compare or reuse
-            task_poll = self._task.poll
-            task_async = self._task.async_val
-            check_mode = self._play_context.check_mode
-            max_timeout = self._connection._play_context.timeout
-            module_name = self._task.action
-            module_args = self._task.args
-
-            if module_args.get('state', None) == 'restored':
-                if not wrap_async:
-                    if not check_mode:
-                        display.warning(self.MSG_WARNING__NO_ASYNC_IS_NO_ROLLBACK % (
-                            task_poll,
-                            task_async,
-                            max_timeout))
-                elif task_poll:
-                    raise AnsibleActionFail(self.MSG_ERROR__ASYNC_AND_POLL_NOT_ZERO % (
-                        task_poll,
-                        task_async,
-                        max_timeout))
-                else:
-                    if task_async > max_timeout and not check_mode:
-                        display.warning(self.MSG_WARNING__ASYNC_GREATER_THAN_TIMEOUT % (
-                            task_poll,
-                            task_async,
-                            max_timeout))
-
-                    # BEGIN snippet from async_status action plugin
-                    env_async_dir = [e for e in self._task.environment if
-                                     "ANSIBLE_ASYNC_DIR" in e]
-                    if len(env_async_dir) > 0:
-                        # for backwards compatibility we need to get the dir from
-                        # ANSIBLE_ASYNC_DIR that is defined in the environment. This is
-                        # deprecated and will be removed in favour of shell options
-                        async_dir = env_async_dir[0]['ANSIBLE_ASYNC_DIR']
-
-                        msg = "Setting the async dir from the environment keyword " \
-                              "ANSIBLE_ASYNC_DIR is deprecated. Set the async_dir " \
-                              "shell option instead"
-                        display.deprecated(msg, version='2.0.0',
-                                           collection_name='community.general')  # was Ansible 2.12
-                    else:
-                        # inject the async directory based on the shell option into the
-                        # module args
-                        async_dir = self.get_shell_option('async_dir', default="~/.ansible_async")
-                    # END snippet from async_status action plugin
-
-                    # Bind the loop max duration to consistent values on both
-                    # remote and local sides (if not the same, make the loop
-                    # longer on the controller); and set a backup file path.
-                    module_args['_timeout'] = task_async
-                    module_args['_back'] = '%s/iptables.state' % async_dir
-                    async_status_args = dict(_async_dir=async_dir)
-                    confirm_cmd = 'rm -f %s' % module_args['_back']
-                    starter_cmd = 'touch %s.starter' % module_args['_back']
-                    remaining_time = max(task_async, max_timeout)
-
-            # do work!
-            result = merge_hash(result, self._execute_module(module_args=module_args, task_vars=task_vars, wrap_async=wrap_async))
-
-            # Then the 3-steps "go ahead or rollback":
-            # 1. Catch early errors of the module (in asynchronous task) if any.
-            #    Touch a file on the target to signal the module to process now.
-            # 2. Reset connection to ensure a persistent one will not be reused.
-            # 3. Confirm the restored state by removing the backup on the remote.
-            #    Retrieve the results of the asynchronous task to return them.
-            if '_back' in module_args:
-                async_status_args['jid'] = result.get('ansible_job_id', None)
-                if async_status_args['jid'] is None:
-                    raise AnsibleActionFail("Unable to get 'ansible_job_id'.")
-
-                # Catch early errors due to missing mandatory option, bad
-                # option type/value, missing required system command, etc.
-                result = merge_hash(result, self._async_result(async_status_args, task_vars, 0))
-
-                # The module is aware to not process the main iptables-restore
-                # command before finding (and deleting) the 'starter' cookie on
-                # the host, so the previous query will not reach ssh timeout.
-                garbage = self._low_level_execute_command(starter_cmd, sudoable=self.DEFAULT_SUDOABLE)
-
-                # As the main command is not yet executed on the target, here
-                # 'finished' means 'failed before main command be executed'.
-                if not result['finished']:
-                    try:
-                        self._connection.reset()
-                    except AttributeError:
-                        pass
-
-                    for x in range(max_timeout):
-                        time.sleep(1)
-                        remaining_time -= 1
-                        # - AnsibleConnectionFailure covers rejected requests (i.e.
-                        #   by rules with '--jump REJECT')
-                        # - ansible_timeout is able to cover dropped requests (due
-                        #   to a rule or policy DROP) if not lower than async_val.
-                        try:
-                            garbage = self._low_level_execute_command(confirm_cmd, sudoable=self.DEFAULT_SUDOABLE)
-                            break
-                        except AnsibleConnectionFailure:
-                            continue
-
-                    result = merge_hash(result, self._async_result(async_status_args, task_vars, remaining_time))
-
-                # Cleanup async related stuff and internal params
-                for key in ('ansible_job_id', 'results_file', 'started', 'finished'):
-                    if result.get(key):
-                        del result[key]
-
-                if result.get('invocation', {}).get('module_args'):
-                    if '_timeout' in result['invocation']['module_args']:
-                        del result['invocation']['module_args']['_back']
-                        del result['invocation']['module_args']['_timeout']
-
-                async_status_args['mode'] = 'cleanup'
-                garbage = self._execute_module(
-                    module_name='ansible.builtin.async_status',
-                    module_args=async_status_args,
-                    task_vars=task_vars,
-                    wrap_async=False)
-
-        if not wrap_async:
-            # remove a temporary path we created
-            self._remove_tmp_path(self._connection._shell.tmpdir)
-
-        return result

plugins/action/system/shutdown.py

@@ -1,211 +0,0 @@
-# Copyright: (c) 2020, Amin Vakil <info@aminvakil.com>
-# Copyright: (c) 2016-2018, Matt Davis <mdavis@ansible.com>
-# Copyright: (c) 2018, Sam Doran <sdoran@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
-
-from ansible.errors import AnsibleError, AnsibleConnectionFailure
-from ansible.module_utils._text import to_native, to_text
-from ansible.module_utils.common.collections import is_string
-from ansible.plugins.action import ActionBase
-from ansible.utils.display import Display
-
-display = Display()
-
-
-class TimedOutException(Exception):
-    pass
-
-
-class ActionModule(ActionBase):
-    TRANSFERS_FILES = False
-    _VALID_ARGS = frozenset((
-        'msg',
-        'delay',
-        'search_paths'
-    ))
-
-    DEFAULT_CONNECT_TIMEOUT = None
-    DEFAULT_PRE_SHUTDOWN_DELAY = 0
-    DEFAULT_SHUTDOWN_MESSAGE = 'Shut down initiated by Ansible'
-    DEFAULT_SHUTDOWN_COMMAND = 'shutdown'
-    DEFAULT_SHUTDOWN_COMMAND_ARGS = '-h {delay_min} "{message}"'
-    DEFAULT_SUDOABLE = True
-
-    SHUTDOWN_COMMANDS = {
-        'alpine': 'poweroff',
-        'vmkernel': 'halt',
-    }
-
-    SHUTDOWN_COMMAND_ARGS = {
-        'alpine': '',
-        'void': '-h +{delay_min} "{message}"',
-        'freebsd': '-h +{delay_sec}s "{message}"',
-        'linux': DEFAULT_SHUTDOWN_COMMAND_ARGS,
-        'macosx': '-h +{delay_min} "{message}"',
-        'openbsd': '-h +{delay_min} "{message}"',
-        'solaris': '-y -g {delay_sec} -i 5 "{message}"',
-        'sunos': '-y -g {delay_sec} -i 5 "{message}"',
-        'vmkernel': '-d {delay_sec}',
-        'aix': '-Fh',
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(ActionModule, self).__init__(*args, **kwargs)
-
-    @property
-    def delay(self):
-        return self._check_delay('delay', self.DEFAULT_PRE_SHUTDOWN_DELAY)
-
-    def _check_delay(self, key, default):
-        """Ensure that the value is positive or zero"""
-        value = int(self._task.args.get(key, default))
-        if value < 0:
-            value = 0
-        return value
-
-    def _get_value_from_facts(self, variable_name, distribution, default_value):
-        """Get dist+version specific args first, then distribution, then family, lastly use default"""
-        attr = getattr(self, variable_name)
-        value = attr.get(
-            distribution['name'] + distribution['version'],
-            attr.get(
-                distribution['name'],
-                attr.get(
-                    distribution['family'],
-                    getattr(self, default_value))))
-        return value
-
-    def get_shutdown_command_args(self, distribution):
-        args = self._get_value_from_facts('SHUTDOWN_COMMAND_ARGS', distribution, 'DEFAULT_SHUTDOWN_COMMAND_ARGS')
-        # Convert seconds to minutes. If less that 60, set it to 0.
-        delay_sec = self.delay
-        shutdown_message = self._task.args.get('msg', self.DEFAULT_SHUTDOWN_MESSAGE)
-        return args.format(delay_sec=delay_sec, delay_min=delay_sec // 60, message=shutdown_message)
-
-    def get_distribution(self, task_vars):
-        # FIXME: only execute the module if we don't already have the facts we need
-        distribution = {}
-        display.debug('{action}: running setup module to get distribution'.format(action=self._task.action))
-        module_output = self._execute_module(
-            task_vars=task_vars,
-            module_name='ansible.legacy.setup',
-            module_args={'gather_subset': 'min'})
-        try:
-            if module_output.get('failed', False):
-                raise AnsibleError('Failed to determine system distribution. {0}, {1}'.format(
-                    to_native(module_output['module_stdout']).strip(),
-                    to_native(module_output['module_stderr']).strip()))
-            distribution['name'] = module_output['ansible_facts']['ansible_distribution'].lower()
-            distribution['version'] = to_text(module_output['ansible_facts']['ansible_distribution_version'].split('.')[0])
-            distribution['family'] = to_text(module_output['ansible_facts']['ansible_os_family'].lower())
-            display.debug("{action}: distribution: {dist}".format(action=self._task.action, dist=distribution))
-            return distribution
-        except KeyError as ke:
-            raise AnsibleError('Failed to get distribution information. Missing "{0}" in output.'.format(ke.args[0]))
-
-    def get_shutdown_command(self, task_vars, distribution):
-        shutdown_bin = self._get_value_from_facts('SHUTDOWN_COMMANDS', distribution, 'DEFAULT_SHUTDOWN_COMMAND')
-        default_search_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
-        search_paths = self._task.args.get('search_paths', default_search_paths)
-
-        # FIXME: switch all this to user arg spec validation methods when they are available
-        # Convert bare strings to a list
-        if is_string(search_paths):
-            search_paths = [search_paths]
-
-        # Error if we didn't get a list
-        err_msg = "'search_paths' must be a string or flat list of strings, got {0}"
-        try:
-            incorrect_type = any(not is_string(x) for x in search_paths)
-            if not isinstance(search_paths, list) or incorrect_type:
-                raise TypeError
-        except TypeError:
-            raise AnsibleError(err_msg.format(search_paths))
-
-        display.debug('{action}: running find module looking in {paths} to get path for "{command}"'.format(
-            action=self._task.action,
-            command=shutdown_bin,
-            paths=search_paths))
-        find_result = self._execute_module(
-            task_vars=task_vars,
-            # prevent collection search by calling with ansible.legacy (still allows library/ override of find)
-            module_name='ansible.legacy.find',
-            module_args={
-                'paths': search_paths,
-                'patterns': [shutdown_bin],
-                'file_type': 'any'
-            }
-        )
-
-        full_path = [x['path'] for x in find_result['files']]
-        if not full_path:
-            raise AnsibleError('Unable to find command "{0}" in search paths: {1}'.format(shutdown_bin, search_paths))
-        self._shutdown_command = full_path[0]
-        return self._shutdown_command
-
-    def perform_shutdown(self, task_vars, distribution):
-        result = {}
-        shutdown_result = {}
-        shutdown_command = self.get_shutdown_command(task_vars, distribution)
-        shutdown_command_args = self.get_shutdown_command_args(distribution)
-        shutdown_command_exec = '{0} {1}'.format(shutdown_command, shutdown_command_args)
-
-        self.cleanup(force=True)
-        try:
-            display.vvv("{action}: shutting down server...".format(action=self._task.action))
-            display.debug("{action}: shutting down server with command '{command}'".format(action=self._task.action, command=shutdown_command_exec))
-            if self._play_context.check_mode:
-                shutdown_result['rc'] = 0
-            else:
-                shutdown_result = self._low_level_execute_command(shutdown_command_exec, sudoable=self.DEFAULT_SUDOABLE)
-        except AnsibleConnectionFailure as e:
-            # If the connection is closed too quickly due to the system being shutdown, carry on
-            display.debug('{action}: AnsibleConnectionFailure caught and handled: {error}'.format(action=self._task.action, error=to_text(e)))
-            shutdown_result['rc'] = 0
-
-        if shutdown_result['rc'] != 0:
-            result['failed'] = True
-            result['shutdown'] = False
-            result['msg'] = "Shutdown command failed. Error was {stdout}, {stderr}".format(
-                stdout=to_native(shutdown_result['stdout'].strip()),
-                stderr=to_native(shutdown_result['stderr'].strip()))
-            return result
-
-        result['failed'] = False
-        result['shutdown_command'] = shutdown_command_exec
-        return result
-
-    def run(self, tmp=None, task_vars=None):
-        self._supports_check_mode = True
-        self._supports_async = True
-
-        # If running with local connection, fail so we don't shutdown ourself
-        if self._connection.transport == 'local' and (not self._play_context.check_mode):
-            msg = 'Running {0} with local connection would shutdown the control node.'.format(self._task.action)
-            return {'changed': False, 'elapsed': 0, 'shutdown': False, 'failed': True, 'msg': msg}
-
-        if task_vars is None:
-            task_vars = {}
-
-        result = super(ActionModule, self).run(tmp, task_vars)
-
-        if result.get('skipped', False) or result.get('failed', False):
-            return result
-
-        distribution = self.get_distribution(task_vars)
-
-        # Initiate shutdown
-        shutdown_result = self.perform_shutdown(task_vars, distribution)
-
-        if shutdown_result['failed']:
-            result = shutdown_result
-            return result
-
-        result['shutdown'] = True
-        result['changed'] = True
-        result['shutdown_command'] = shutdown_result['shutdown_command']
-
-        return result

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,8 +117,9 @@ class BecomeModule(BecomeBase):
         if not self.get_option('become_pass') and '-n' not in flags:
             flags += ' -n'
 
-        become_user = self.get_option('become_user')
-        user = '-u %s' % (become_user) if become_user else ''
+        user = self.get_option('become_user')
+        if user:
+            user = '-u %s' % (user)
 
         success_cmd = self._build_success_command(cmd, shell, noexe=True)
         executable = getattr(shell, 'executable', shell.SHELL_FAMILY)

plugins/become/dzdo.py

@@ -89,7 +89,8 @@ class BecomeModule(BecomeBase):
             self.prompt = '[dzdo via ansible, key=%s] password:' % self._id
             flags = '%s -p "%s"' % (flags.replace('-n', ''), self.prompt)
 
-        become_user = self.get_option('become_user')
-        user = '-u %s' % (become_user) if become_user else ''
+        user = self.get_option('become_user')
+        if user:
+            user = '-u %s' % (user)
 
         return ' '.join([becomecmd, flags, user, self._build_success_command(cmd, shell)])

plugins/become/ksu.py

@@ -13,6 +13,7 @@ DOCUMENTATION = '''
     options:
         become_user:
             description: User you 'become' to execute the task
+            default: ''
             ini:
               - section: privilege_escalation
                 key: become_user

plugins/become/pbrun.py

@@ -97,8 +97,9 @@ class BecomeModule(BecomeBase):
         become_exe = self.get_option('become_exe')
 
         flags = self.get_option('become_flags')
-        become_user = self.get_option('become_user')
-        user = '-u %s' % (become_user) if become_user else ''
+        user = self.get_option('become_user')
+        if user:
+            user = '-u %s' % (user)
         noexe = not self.get_option('wrap_exe')
 
         return ' '.join([become_exe, flags, user, self._build_success_command(cmd, shell, noexe=noexe)])

plugins/become/pfexec.py

@@ -14,7 +14,7 @@ DOCUMENTATION = '''
         become_user:
             description:
                 - User you 'become' to execute the task
-                - This plugin ignores this setting as pfexec uses it's own C(exec_attr) to figure this out,
+                - This plugin ignores this setting as pfexec uses it's own ``exec_attr`` to figure this out,
                   but it is supplied here for Ansible to make decisions needed for the task execution, like file permissions.
             default: root
             ini:
@@ -80,8 +80,8 @@ DOCUMENTATION = '''
               - name: ansible_pfexec_wrap_execution
             env:
               - name: ANSIBLE_PFEXEC_WRAP_EXECUTION
-    notes:
-      - This plugin ignores I(become_user) as pfexec uses it's own C(exec_attr) to figure this out.
+    note:
+      - This plugin ignores ``become_user`` as pfexec uses it's own ``exec_attr`` to figure this out.
 '''
 
 from ansible.plugins.become import BecomeBase

plugins/cache/memcached.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     cache: memcached
     short_description: Use memcached DB for cache
     description:
@@ -57,9 +56,8 @@ from ansible.utils.display import Display
 
 try:
     import memcache
-    HAS_MEMCACHE = True
 except ImportError:
-    HAS_MEMCACHE = False
+    raise AnsibleError("python-memcached is required for the memcached fact cache")
 
 display = Display()
 
@@ -161,7 +159,7 @@ class CacheModuleKeys(MutableSet):
         self._cache.set(self.PREFIX, self._keyset)
 
     def remove_by_timerange(self, s_min, s_max):
-        for k in list(self._keyset.keys()):
+        for k in self._keyset.keys():
             t = self._keyset[k]
             if s_min < t < s_max:
                 del self._keyset[k]
@@ -188,9 +186,6 @@ class CacheModule(BaseCacheModule):
             self._timeout = C.CACHE_PLUGIN_TIMEOUT
             self._prefix = C.CACHE_PLUGIN_PREFIX
 
-        if not HAS_MEMCACHE:
-            raise AnsibleError("python-memcached is required for the memcached fact cache")
-
         self._cache = {}
         self._db = ProxyClientPool(connection, debug=0)
         self._keys = CacheModuleKeys(self._db, self._db.get(CacheModuleKeys.PREFIX) or [])

plugins/cache/redis.py

@@ -5,7 +5,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     cache: redis
     short_description: Use Redis DB for cache
     description:
@@ -18,7 +17,6 @@ DOCUMENTATION = '''
           - A colon separated string of connection information for Redis.
           - The format is C(host:port:db:password), for example C(localhost:6379:0:changeme).
           - To use encryption in transit, prefix the connection with C(tls://), as in C(tls://localhost:6379:0:changeme).
-          - To use redis sentinel, use separator C(;), for example C(localhost:26379;localhost:26379;0:changeme). Requires redis>=2.9.0.
         required: True
         env:
           - name: ANSIBLE_CACHE_PLUGIN_CONNECTION
@@ -33,23 +31,6 @@ DOCUMENTATION = '''
         ini:
           - key: fact_caching_prefix
             section: defaults
-      _keyset_name:
-        description: User defined name for cache keyset name.
-        default: ansible_cache_keys
-        env:
-          - name: ANSIBLE_CACHE_REDIS_KEYSET_NAME
-        ini:
-          - key: fact_caching_redis_keyset_name
-            section: defaults
-        version_added: 1.3.0
-      _sentinel_service_name:
-        description: The redis sentinel service name (or referenced as cluster name).
-        env:
-          - name: ANSIBLE_CACHE_REDIS_SENTINEL
-        ini:
-          - key: fact_caching_redis_sentinel
-            section: defaults
-        version_added: 1.3.0
       _timeout:
         default: 86400
         description: Expiration timeout in seconds for the cache plugin data. Set to 0 to never expire
@@ -66,16 +47,14 @@ import json
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
-from ansible.module_utils._text import to_native
 from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
 from ansible.plugins.cache import BaseCacheModule
 from ansible.utils.display import Display
 
 try:
     from redis import StrictRedis, VERSION
-    HAS_REDIS = True
 except ImportError:
-    HAS_REDIS = False
+    raise AnsibleError("The 'redis' python module (version 2.4.5 or newer) is required for the redis fact cache, 'pip install redis'")
 
 display = Display()
 
@@ -89,8 +68,6 @@ class CacheModule(BaseCacheModule):
     to expire keys. This mechanism is used or a pattern matched 'scan' for
     performance.
     """
-    _sentinel_service_name = None
-
     def __init__(self, *args, **kwargs):
         uri = ''
 
@@ -100,8 +77,6 @@ class CacheModule(BaseCacheModule):
                 uri = self.get_option('_uri')
             self._timeout = float(self.get_option('_timeout'))
             self._prefix = self.get_option('_prefix')
-            self._keys_set = self.get_option('_keyset_name')
-            self._sentinel_service_name = self.get_option('_sentinel_service_name')
         except KeyError:
             display.deprecated('Rather than importing CacheModules directly, '
                                'use ansible.plugins.loader.cache_loader',
@@ -110,60 +85,17 @@ class CacheModule(BaseCacheModule):
                 uri = C.CACHE_PLUGIN_CONNECTION
             self._timeout = float(C.CACHE_PLUGIN_TIMEOUT)
             self._prefix = C.CACHE_PLUGIN_PREFIX
-            self._keys_set = 'ansible_cache_keys'
-
-        if not HAS_REDIS:
-            raise AnsibleError("The 'redis' python module (version 2.4.5 or newer) is required for the redis fact cache, 'pip install redis'")
 
         self._cache = {}
         kw = {}
-
-        # tls connection
         tlsprefix = 'tls://'
         if uri.startswith(tlsprefix):
             kw['ssl'] = True
             uri = uri[len(tlsprefix):]
 
-        # redis sentinel connection
-        if self._sentinel_service_name:
-            self._db = self._get_sentinel_connection(uri, kw)
-        # normal connection
-        else:
-            connection = uri.split(':')
-            self._db = StrictRedis(*connection, **kw)
-
-        display.vv('Redis connection: %s' % self._db)
-
-    def _get_sentinel_connection(self, uri, kw):
-        """
-        get sentinel connection details from _uri
-        """
-        try:
-            from redis.sentinel import Sentinel
-        except ImportError:
-            raise AnsibleError("The 'redis' python module (version 2.9.0 or newer) is required to use redis sentinel.")
-
-        if ';' not in uri:
-            raise AnsibleError('_uri does not have sentinel syntax.')
-
-        # format: "localhost:26379;localhost2:26379;0:changeme"
-        connections = uri.split(';')
-        connection_args = connections.pop(-1)
-        if len(connection_args) > 0:  # hanle if no db nr is given
-            connection_args = connection_args.split(':')
-            kw['db'] = connection_args.pop(0)
-            try:
-                kw['password'] = connection_args.pop(0)
-            except IndexError:
-                pass  # password is optional
-
-        sentinels = [tuple(shost.split(':')) for shost in connections]
-        display.vv('\nUsing redis sentinels: %s' % sentinels)
-        scon = Sentinel(sentinels, **kw)
-        try:
-            return scon.master_for(self._sentinel_service_name, socket_timeout=0.2)
-        except Exception as exc:
-            raise AnsibleError('Could not connect to redis sentinel: %s' % to_native(exc))
+        connection = uri.split(':')
+        self._db = StrictRedis(*connection, **kw)
+        self._keys_set = 'ansible_cache_keys'
 
     def _make_key(self, key):
         return self._prefix + key
@@ -216,12 +148,14 @@ class CacheModule(BaseCacheModule):
         self._db.zrem(self._keys_set, key)
 
     def flush(self):
-        for key in list(self.keys()):
+        for key in self.keys():
             self.delete(key)
 
     def copy(self):
         # TODO: there is probably a better way to do this in redis
-        ret = dict([(k, self.get(k)) for k in self.keys()])
+        ret = dict()
+        for key in self.keys():
+            ret[key] = self.get(key)
         return ret
 
     def __getstate__(self):

plugins/callback/actionable.py

@@ -7,7 +7,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: actionable
     type: stdout
     short_description: shows only items that need attention

plugins/callback/cgroup_memory_recap.py

@@ -7,9 +7,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: cgroup_memory_recap
-    type: aggregate
+    callback_type: aggregate
     requirements:
       - whitelist in configuration
       - cgroups

plugins/callback/context_demo.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: context_demo
     type: aggregate
     short_description: demo callback that adds play/task context

plugins/callback/counter_enabled.py

@@ -6,9 +6,13 @@
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
+from ansible import constants as C
+from ansible.plugins.callback import CallbackBase
+from ansible.utils.color import colorize, hostcolor
+from ansible.template import Templar
+from ansible.playbook.task_include import TaskInclude
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: counter_enabled
     type: stdout
     short_description: adds counters to the output items (tasks and hosts/task)
@@ -22,12 +26,6 @@ DOCUMENTATION = '''
       - set as stdout callback in ansible.cfg  (stdout_callback = counter_enabled)
 '''
 
-from ansible import constants as C
-from ansible.plugins.callback import CallbackBase
-from ansible.utils.color import colorize, hostcolor
-from ansible.template import Templar
-from ansible.playbook.task_include import TaskInclude
-
 
 class CallbackModule(CallbackBase):
 

plugins/callback/diy.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 
 DOCUMENTATION = r'''
   callback: diy
-  type: stdout
+  callback_type: stdout
   short_description: Customize the output
   version_added: 0.2.0
   description:
@@ -629,7 +629,7 @@ playbook.yml: >
     gather_facts: no
     tasks:
       - name:  Default plugin output
-        ansible.builtin.debug:
+        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
-        ansible.builtin.debug:
+        debug:
           msg: "default plugin output: result example"
 
       - name: Override from task vars
-        ansible.builtin.debug:
+        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
-        ansible.builtin.debug:
+        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)
-        ansible.builtin.debug:
+        debug:
           msg:
         when: False
         vars:
@@ -719,13 +719,13 @@ playbook.yml: >
           on_skipped_msg_color: white
 
       - name: Just stdout
-        ansible.builtin.command: echo some stdout
+        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
-        ansible.builtin.debug:
+        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
-        ansible.builtin.debug:
+        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
-        ansible.builtin.shell: "echo {% raw %}'output from {{ file_name }}'{% endraw %} > {{ file_name }}"
+        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'
-        ansible.builtin.debug:
+        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'
-        ansible.builtin.debug:
+        debug:
           msg: ''
         vars:
           ansible_callback_diy_playbook_on_task_start_msg: "\nDIY output(via task vars): task example: {{ ansible_callback_diy.task.name }}"
@@ -1013,7 +1013,7 @@ class CallbackModule(Default):
             for attr in _stats_attributes:
                 _ret[self.DIY_NS]['stats'].update({attr: _get_value(obj=stats, attr=attr)})
 
-        _ret[self.DIY_NS].update({'top_level_var_names': list(_ret.keys())})
+        _ret[self.DIY_NS].update({'top_level_var_names': _ret.keys()})
 
         return _ret
 

plugins/callback/full_skip.py

@@ -7,7 +7,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: full_skip
     type: stdout
     short_description: suppresses tasks if all hosts skipped

plugins/callback/hipchat.py

@@ -6,9 +6,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: hipchat
-    type: notification
+    callback_type: notification
     requirements:
       - whitelist in configuration.
       - prettytable (python lib)
@@ -173,7 +172,8 @@ class CallbackModule(CallbackBase):
         # Displays info about playbook being started by a person on an
         # inventory, as well as Tags, Skip Tags and Limits
         if not self.printed_playbook:
-            self.playbook_name, dummy = os.path.splitext(os.path.basename(self.play.playbook.filename))
+            self.playbook_name, _ = os.path.splitext(
+                os.path.basename(self.play.playbook.filename))
             host_list = self.play.playbook.inventory.host_list
             inventory = os.path.basename(os.path.realpath(host_list))
             self.send_msg("%s: Playbook initiated by %s against %s" %

plugins/callback/jabber.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: jabber
     type: notification
     short_description: post task events to a jabber server

plugins/callback/log_plays.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: log_plays
     type: notification
     short_description: write playbook output to log file
@@ -54,7 +53,7 @@ class CallbackModule(CallbackBase):
     CALLBACK_NEEDS_WHITELIST = True
 
     TIME_FORMAT = "%b %d %Y %H:%M:%S"
-    MSG_FORMAT = "%(now)s - %(playbook)s - %(task_name)s - %(task_action)s - %(category)s - %(data)s\n\n"
+    MSG_FORMAT = "%(now)s - %(category)s - %(data)s\n\n"
 
     def __init__(self):
 
@@ -68,8 +67,7 @@ class CallbackModule(CallbackBase):
         if not os.path.exists(self.log_folder):
             makedirs_safe(self.log_folder)
 
-    def log(self, result, category):
-        data = result._result
+    def log(self, host, category, data):
         if isinstance(data, MutableMapping):
             if '_ansible_verbose_override' in data:
                 # avoid logging extraneous data
@@ -81,43 +79,30 @@ class CallbackModule(CallbackBase):
                 if invocation is not None:
                     data = json.dumps(invocation) + " => %s " % data
 
-        path = os.path.join(self.log_folder, result._host.get_name())
+        path = os.path.join(self.log_folder, host)
         now = time.strftime(self.TIME_FORMAT, time.localtime())
 
-        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,
-            )
-        )
+        msg = to_bytes(self.MSG_FORMAT % dict(now=now, category=category, data=data))
         with open(path, "ab") as fd:
             fd.write(msg)
 
-    def v2_runner_on_failed(self, result, ignore_errors=False):
-        self.log(result, 'FAILED')
+    def runner_on_failed(self, host, res, ignore_errors=False):
+        self.log(host, 'FAILED', res)
 
-    def v2_runner_on_ok(self, result):
-        self.log(result, 'OK')
+    def runner_on_ok(self, host, res):
+        self.log(host, 'OK', res)
 
-    def v2_runner_on_skipped(self, result):
-        self.log(result, 'SKIPPED')
+    def runner_on_skipped(self, host, item=None):
+        self.log(host, 'SKIPPED', '...')
 
-    def v2_runner_on_unreachable(self, result):
-        self.log(result, 'UNREACHABLE')
+    def runner_on_unreachable(self, host, res):
+        self.log(host, 'UNREACHABLE', res)
 
-    def v2_runner_on_async_failed(self, result):
-        self.log(result, 'ASYNC_FAILED')
+    def runner_on_async_failed(self, host, res, jid):
+        self.log(host, 'ASYNC_FAILED', res)
 
-    def v2_playbook_on_start(self, playbook):
-        self.playbook = playbook._file_name
+    def playbook_on_import_for_host(self, host, imported_file):
+        self.log(host, 'IMPORTED', imported_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)
+    def playbook_on_not_import_for_host(self, host, missing_file):
+        self.log(host, 'NOTIMPORTED', missing_file)

plugins/callback/logdna.py

@@ -5,9 +5,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: logdna
-    type: aggregate
+    callback_type: aggregate
     short_description: Sends playbook logs to LogDNA
     description:
       - This callback will report logs from playbook actions, tasks, and events to LogDNA (https://app.logdna.com)

plugins/callback/logentries.py

@@ -5,7 +5,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: logentries
     type: notification
     short_description: Sends events to Logentries
@@ -76,7 +75,7 @@ examples: >
   To enable, add this to your ansible.cfg file in the defaults block
 
     [defaults]
-    callback_whitelist = community.general.logentries
+    callback_whitelist = logentries
 
   Either set the environment variables
     export LOGENTRIES_API=data.logentries.com

plugins/callback/logstash.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: logstash
     type: notification
     short_description: Sends events to Logstash
@@ -20,28 +19,16 @@ 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
 '''
 
@@ -81,7 +68,7 @@ class CallbackModule(CallbackBase):
     Requires:
         python-logstash
 
-    This plugin makes use of the following environment variables or ini config:
+    This plugin makes use of the following environment variables:
         LOGSTASH_SERVER   (optional): defaults to localhost
         LOGSTASH_PORT     (optional): defaults to 5000
         LOGSTASH_TYPE     (optional): defaults to ansible
@@ -92,37 +79,30 @@ class CallbackModule(CallbackBase):
     CALLBACK_NAME = 'community.general.logstash'
     CALLBACK_NEEDS_WHITELIST = True
 
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display=display)
+    def __init__(self):
+        super(CallbackModule, self).__init__()
 
         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 = {

plugins/callback/mail.py

@@ -52,7 +52,7 @@ options:
     ini:
         - section: callback_mail
           key: bcc
-notes:
+note:
 - "TODO: expand configuration options now that plugins can leverage Ansible's configuration"
 '''
 

plugins/callback/null.py

@@ -6,9 +6,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: 'null'
-    type: stdout
+    callback_type: stdout
     requirements:
       - set as main display callback
     short_description: Don't display stuff to screen

plugins/callback/say.py

@@ -7,7 +7,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: say
     type: notification
     requirements:
@@ -17,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(community.general.say).
+      - In 2.8, this callback has been renamed from C(osx_say) into M(say).
 '''
 
 import distutils.spawn

plugins/callback/selective.py

@@ -6,9 +6,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: selective
-    type: stdout
+    callback_type: stdout
     requirements:
       - set as main display callback
     short_description: only print certain tasks
@@ -31,8 +30,8 @@ DOCUMENTATION = '''
 '''
 
 EXAMPLES = """
-  - ansible.builtin.debug: msg="This will not be printed"
-  - ansible.builtin.debug: msg="But this will"
+  - debug: msg="This will not be printed"
+  - debug: msg="But this will"
     tags: [print_action]
 """
 
@@ -41,16 +40,7 @@ import difflib
 from ansible import constants as C
 from ansible.plugins.callback import CallbackBase
 from ansible.module_utils._text import to_text
-
-try:
-    codeCodes = C.COLOR_CODES
-except AttributeError:
-    # This constant was moved to ansible.constants in
-    # https://github.com/ansible/ansible/commit/1202dd000f10b0e8959019484f1c3b3f9628fc67
-    # (will be included in ansible-core 2.11.0). For older Ansible/ansible-base versions,
-    # we include from the original location.
-    from ansible.utils.color import codeCodes
-
+from ansible.utils.color import codeCodes
 
 DONT_COLORIZE = False
 COLORS = {
@@ -67,7 +57,7 @@ COLORS = {
 
 def dict_diff(prv, nxt):
     """Return a dict of keys that differ with another config object."""
-    keys = set(list(prv.keys()) + list(nxt.keys()))
+    keys = set(prv.keys() + nxt.keys())
     result = {}
     for k in keys:
         if prv.get(k) != nxt.get(k):
@@ -211,7 +201,7 @@ class CallbackModule(CallbackBase):
                                      )
             if 'results' in result._result:
                 for r in result._result['results']:
-                    failed = 'failed' in r and r['failed']
+                    failed = 'failed' in r
 
                     stderr = [r.get('exception', None), r.get('module_stderr', None)]
                     stderr = "\n".join([e for e in stderr if e]).strip()

plugins/callback/slack.py

@@ -7,9 +7,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: slack
-    type: notification
+    callback_type: notification
     requirements:
       - whitelist in configuration
       - prettytable (python library)

plugins/callback/splunk.py

@@ -21,7 +21,7 @@ DOCUMENTATION = '''
     callback: splunk
     type: aggregate
     short_description: Sends task result events to Splunk HTTP Event Collector
-    author: "Stuart Hirst (!UNKNOWN) <support@convergingdata.com>"
+    author: "Stuart Hirst <support@convergingdata.com>"
     description:
       - This callback plugin will send task results as JSON formatted events to a Splunk HTTP collector.
       - The companion Splunk Monitoring & Diagnostics App is available here "https://splunkbase.splunk.com/app/4023/"
@@ -45,25 +45,13 @@ 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 = '''
 examples: >
   To enable, add this to your ansible.cfg file in the defaults block
     [defaults]
-    callback_whitelist = community.general.splunk
+    callback_whitelist = splunk
   Set the environment variable
     export SPLUNK_URL=http://mysplunkinstance.datapaas.io:8088/services/collector/event
     export SPLUNK_AUTHTOKEN=f23blad6-5965-4537-bf69-5b5a545blabla88
@@ -96,7 +84,7 @@ class SplunkHTTPCollectorSource(object):
         self.ip_address = socket.gethostbyname(socket.gethostname())
         self.user = getpass.getuser()
 
-    def send_event(self, url, authtoken, validate_certs, state, result, runtime):
+    def send_event(self, url, authtoken, state, result, runtime):
         if result._task_fields['args'].get('_ansible_check_mode') is True:
             self.ansible_check_mode = True
 
@@ -141,8 +129,7 @@ class SplunkHTTPCollectorSource(object):
                 'Content-type': 'application/json',
                 'Authorization': 'Splunk ' + authtoken
             },
-            method='POST',
-            validate_certs=validate_certs
+            method='POST'
         )
 
 
@@ -157,7 +144,6 @@ 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):
@@ -167,9 +153,7 @@ 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')
 
@@ -191,8 +175,6 @@ 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)
 
@@ -206,7 +188,6 @@ class CallbackModule(CallbackBase):
         self.splunk.send_event(
             self.url,
             self.authtoken,
-            self.validate_certs,
             'OK',
             result,
             self._runtime(result)
@@ -216,7 +197,6 @@ class CallbackModule(CallbackBase):
         self.splunk.send_event(
             self.url,
             self.authtoken,
-            self.validate_certs,
             'SKIPPED',
             result,
             self._runtime(result)
@@ -226,7 +206,6 @@ class CallbackModule(CallbackBase):
         self.splunk.send_event(
             self.url,
             self.authtoken,
-            self.validate_certs,
             'FAILED',
             result,
             self._runtime(result)
@@ -236,7 +215,6 @@ class CallbackModule(CallbackBase):
         self.splunk.send_event(
             self.url,
             self.authtoken,
-            self.validate_certs,
             'FAILED',
             result,
             self._runtime(result)
@@ -246,7 +224,6 @@ class CallbackModule(CallbackBase):
         self.splunk.send_event(
             self.url,
             self.authtoken,
-            self.validate_certs,
             'UNREACHABLE',
             result,
             self._runtime(result)

plugins/callback/stderr.py

@@ -7,9 +7,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: stderr
-    type: stdout
+    callback_type: stdout
     requirements:
       - set as main display callback
     short_description: Splits output, sending failed tasks to stderr

plugins/callback/sumologic.py

@@ -42,7 +42,7 @@ EXAMPLES = '''
 examples: >
   To enable, add this to your ansible.cfg file in the defaults block
     [defaults]
-    callback_whitelist = community.general.sumologic
+    callback_whitelist = sumologic
 
   Set the environment variable
     export SUMOLOGIC_URL=https://endpoint1.collection.us2.sumologic.com/receiver/v1/http/R8moSv1d8EW9LAUFZJ6dbxCFxwLH6kfCdcBfddlfxCbLuL-BN5twcTpMk__pYy_cDmp==

plugins/callback/syslog_json.py

@@ -6,9 +6,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: syslog_json
-    type: notification
+    callback_type: notification
     requirements:
       - whitelist in configuration
     short_description: sends JSON events to syslog

plugins/callback/unixy.py

@@ -9,7 +9,7 @@ __metaclass__ = type
 DOCUMENTATION = '''
     callback: unixy
     type: stdout
-    author: Allyson Bowles (@akatch)
+    author: Allyson Bowles <@akatch>
     short_description: condensed Ansible output
     description:
       - Consolidated Ansible output in the style of LINUX/UNIX startup logs.

plugins/callback/yaml.py

@@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Unknown (!UNKNOWN)
     callback: yaml
     type: stdout
     short_description: yaml-ized Ansible screen output
@@ -50,7 +49,7 @@ def my_represent_scalar(self, tag, value, style=None):
             # ...no trailing space
             value = value.rstrip()
             # ...and non-printable characters
-            value = ''.join(x for x in value if x in string.printable or ord(x) >= 0xA0)
+            value = ''.join(x for x in value if x in string.printable)
             # ...tabs prevent blocks from expanding
             value = value.expandtabs()
             # ...and odd bits of whitespace

plugins/connection/chroot.py

@@ -9,7 +9,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Maykel Moya (!UNKNOWN) <mmoya@speedyrails.com>
+    author: Maykel Moya <mmoya@speedyrails.com>
     connection: chroot
     short_description: Interact with local chroot
     description:

plugins/connection/docker.py

@@ -11,8 +11,8 @@ __metaclass__ = type
 
 DOCUMENTATION = '''
     author:
-        - Lorin Hochestein (!UNKNOWN)
-        - Leendert Brouwer (!UNKNOWN)
+        - Lorin Hochestein
+        - Leendert Brouwer
     connection: docker
     short_description: Run tasks in docker containers
     description:
@@ -116,9 +116,7 @@ class Connection(ConnectionBase):
 
     @staticmethod
     def _sanitize_version(version):
-        version = re.sub(u'[^0-9a-zA-Z.]', u'', version)
-        version = re.sub(u'^v', u'', version)
-        return version
+        return re.sub(u'[^0-9a-zA-Z.]', u'', version)
 
     def _old_docker_version(self):
         cmd_args = []

plugins/connection/funcd.py

@@ -37,13 +37,12 @@ import tempfile
 import shutil
 
 from ansible.errors import AnsibleError
-from ansible.plugins.connection import ConnectionBase
 from ansible.utils.display import Display
 
 display = Display()
 
 
-class Connection(ConnectionBase):
+class Connection(object):
     ''' Func-based connections '''
 
     has_pipelining = False

plugins/connection/iocage.py

@@ -9,7 +9,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Stephan Lohse (!UNKNOWN) <dev-github@ploek.org>
+    author: Stephan Lohse <dev-github@ploek.org>
     connection: iocage
     short_description: Run tasks in iocage jails
     description:

plugins/connection/lxc.py

@@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Joerg Thalheim (!UNKNOWN) <joerg@higgsboson.tk>
+    author: Joerg Thalheim <joerg@higgsboson.tk>
     connection: lxc
     short_description: Run tasks in lxc containers via lxc python library
     description:
@@ -86,7 +86,7 @@ class Connection(ConnectionBase):
             write_fds = []
         while len(read_fds) > 0 or len(write_fds) > 0:
             try:
-                ready_reads, ready_writes, dummy = select.select(read_fds, write_fds, [])
+                ready_reads, ready_writes, _ = select.select(read_fds, write_fds, [])
             except select.error as e:
                 if e.args[0] == errno.EINTR:
                     continue

plugins/connection/lxd.py

@@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Matt Clay (@mattclay) <matt@mystile.com>
+    author: Matt Clay <matt@mystile.com>
     connection: lxd
     short_description: Run tasks in lxc containers via lxc CLI
     description:

plugins/connection/oc.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 DOCUMENTATION = '''
     author:
-        - xuxinkun (!UNKNOWN)
+        - xuxinkun
 
     connection: oc
 
@@ -147,10 +147,10 @@ DOCUMENTATION = '''
         aliases: [ oc_verify_ssl ]
 '''
 
-from ansible_collections.community.kubernetes.plugins.connection.kubectl import Connection as KubectlConnection
+from ansible_collections.community.general.plugins.connection.kubectl import Connection as KubectlConnection
 
 
-CONNECTION_TRANSPORT = 'community.general.oc'
+CONNECTION_TRANSPORT = 'oc'
 
 CONNECTION_OPTIONS = {
     'oc_container': '-c',

plugins/connection/saltstack.py

@@ -19,7 +19,6 @@ DOCUMENTATION = '''
 import re
 import os
 import pty
-import codecs
 import subprocess
 
 from ansible.module_utils._text import to_bytes, to_text
@@ -86,9 +85,9 @@ class Connection(ConnectionBase):
 
         out_path = self._normalize_path(out_path, '/')
         self._display.vvv("PUT %s TO %s" % (in_path, out_path), host=self.host)
-        with open(in_path, 'rb') as in_fh:
+        with open(in_path) as in_fh:
             content = in_fh.read()
-        self.client.cmd(self.host, 'hashutil.base64_decodefile', [codecs.encode(content, 'base64'), out_path])
+        self.client.cmd(self.host, 'file.write', [out_path, content])
 
     # TODO test it
     def fetch_file(self, in_path, out_path):

plugins/doc_fragments/_gcp.py

@@ -3,9 +3,6 @@
 # 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.

plugins/doc_fragments/alicloud.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/auth_basic.py

@@ -2,9 +2,6 @@
 
 # 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):
 

plugins/doc_fragments/digital_ocean.py

@@ -0,0 +1,30 @@
+# -*- 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
+'''

plugins/doc_fragments/dimensiondata.py

@@ -3,9 +3,6 @@
 # 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>
 
@@ -19,6 +16,7 @@ options:
   region:
     description:
       - The target region.
+    choices:
       - Regions are defined in Apache libcloud project [libcloud/common/dimensiondata.py]
       - They are also listed in U(https://libcloud.readthedocs.io/en/latest/compute/drivers/dimensiondata.html)
       - Note that the default value "na" stands for "North America".

plugins/doc_fragments/dimensiondata_wait.py

@@ -3,9 +3,6 @@
 # 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>
 

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(ansible.builtin.pip).
+    For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(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.

plugins/doc_fragments/emc.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/hetzner.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/hpe3par.py

@@ -2,9 +2,6 @@
 # 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):
 

plugins/doc_fragments/hwc.py

@@ -2,9 +2,6 @@
 # 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):
 

plugins/doc_fragments/infinibox.py

@@ -0,0 +1,34 @@
+# -*- 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
+'''

plugins/doc_fragments/influxdb.py

@@ -4,9 +4,6 @@
 # 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
@@ -40,7 +37,6 @@ options:
   path:
     description:
     - The path on which InfluxDB server is accessible
-    - Only available when using python-influxdb >= 5.1.0
     type: str
     version_added: '0.2.0'
   validate_certs:
@@ -53,7 +49,6 @@ options:
     description:
     - Use https instead of http to connect to InfluxDB server.
     type: bool
-    default: false
   timeout:
     description:
     - Number of seconds Requests will wait for client to establish a connection.
@@ -62,14 +57,12 @@ options:
     description:
     - Number of retries client will try before aborting.
     - C(0) indicates try until success.
-    - Only available when using python-influxdb >= 4.1.0
     type: int
     default: 3
   use_udp:
     description:
     - Use UDP to connect to InfluxDB server.
     type: bool
-    default: false
   udp_port:
     description:
     - UDP port to connect to InfluxDB server.

plugins/doc_fragments/ipa.py

@@ -4,9 +4,6 @@
 # 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

plugins/doc_fragments/keycloak.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/kubevirt_common_options.py

@@ -3,9 +3,6 @@
 # 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'''

plugins/doc_fragments/kubevirt_vm_options.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/ldap.py

@@ -5,9 +5,6 @@
 # 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

plugins/doc_fragments/lxca_common.py

@@ -1,10 +1,34 @@
 # -*- 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.
-# 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
+# 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.
+#
 
 
 class ModuleDocFragment(object):

plugins/doc_fragments/manageiq.py

@@ -3,9 +3,6 @@
 # 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):
 
@@ -15,14 +12,14 @@ options:
   manageiq_connection:
     description:
       - ManageIQ connection configuration information.
-    required: false
+    required: true
     type: dict
     suboptions:
       url:
         description:
           - ManageIQ environment url. C(MIQ_URL) env var if set. otherwise, it is required to pass it.
         type: str
-        required: false
+        required: true
       username:
         description:
           - ManageIQ username. C(MIQ_USERNAME) env var if set. otherwise, required if no token is passed in.
@@ -44,7 +41,7 @@ options:
       ca_cert:
         description:
           - The path to a CA bundle file or directory with certificates. defaults to None.
-        type: str
+        type: path
         aliases: [ ca_bundle_path ]
 
 requirements:

plugins/doc_fragments/mysql.py

@@ -0,0 +1,79 @@
+# -*- 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``.
+'''

plugins/doc_fragments/nios.py

@@ -3,9 +3,6 @@
 # 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):
 
@@ -24,6 +21,7 @@ options:
           - Value can also be specified using C(INFOBLOX_HOST) environment
             variable.
         type: str
+        required: true
       username:
         description:
           - Configures the username to use to authenticate the connection to

plugins/doc_fragments/nomad.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2020 FERREIRA Christophe <christophe.ferreira@cnaf.fr>
-# 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 files documentation fragment
-    DOCUMENTATION = r'''
-options:
-    host:
-      description:
-        - FQDN of Nomad server.
-      required: true
-      type: str
-    use_ssl:
-      description:
-        - Use TLS/SSL connection.
-      type: bool
-      default: true
-    timeout:
-      description:
-        - Timeout (in seconds) for the request to Nomad.
-      type: int
-      default: 5
-    validate_certs:
-      description:
-        - Enable TLS/SSL certificate validation.
-      type: bool
-      default: true
-    client_cert:
-      description:
-        - Path of certificate for TLS/SSL.
-      type: path
-    client_key:
-      description:
-        - Path of certificate's private key for TLS/SSL.
-      type: path
-    namespace:
-      description:
-        - Namespace for Nomad.
-      type: str
-    token:
-      description:
-        - ACL token for authentification.
-      type: str
-'''

plugins/doc_fragments/oneview.py

@@ -3,9 +3,6 @@
 # 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):
 
@@ -13,32 +10,12 @@ class ModuleDocFragment(object):
     DOCUMENTATION = r'''
 options:
     config:
-        description:
+      description:
         - Path to a .json configuration file containing the OneView client configuration.
           The configuration file is optional and when used should be present in the host running the ansible commands.
           If the file path is not provided, the configuration will be loaded from environment variables.
           For links to example configuration files or how to use the environment variables verify the notes section.
-        type: path
-    api_version:
-        description:
-        - OneView API Version.
-        type: int
-    image_streamer_hostname:
-        description:
-        - IP address or hostname for the HPE Image Streamer REST API.
-        type: str
-    hostname:
-        description:
-        - IP address or hostname for the appliance.
-        type: str
-    username:
-        description:
-        - Username for API authentication.
-        type: str
-    password:
-        description:
-        - Password for API authentication.
-        type: str
+      type: path
 
 requirements:
   - python >= 2.7.9

plugins/doc_fragments/online.py

@@ -2,9 +2,6 @@
 
 # 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):
 
@@ -15,7 +12,6 @@ options:
     description:
       - Online OAuth token.
     type: str
-    required: true
     aliases: [ oauth_token ]
   api_url:
     description:

plugins/doc_fragments/opennebula.py

@@ -3,9 +3,6 @@
 # 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

plugins/doc_fragments/openswitch.py

@@ -3,9 +3,6 @@
 # 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):
 

plugins/doc_fragments/oracle.py

@@ -1,9 +1,6 @@
 # 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 = """

plugins/doc_fragments/oracle_creatable_resource.py

@@ -1,9 +1,6 @@
 # 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 = """
@@ -20,5 +17,4 @@ class ModuleDocFragment(object):
                          identify an instance of the resource. By default, all the attributes of a resource except
                          I(freeform_tags) are used to uniquely identify a resource.
             type: list
-            elements: str
     """

plugins/doc_fragments/oracle_display_name_option.py

@@ -1,9 +1,6 @@
 # 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 = """

plugins/doc_fragments/oracle_name_option.py

@@ -1,9 +1,6 @@
 # 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 = """

plugins/doc_fragments/oracle_tags.py

@@ -1,9 +1,6 @@
 # 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 = """

plugins/doc_fragments/oracle_wait_options.py

@@ -1,9 +1,6 @@
 # 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 = """