Start of work folding threading and forking together

.azure-pipelines/azure-pipelines.yml

@@ -1,233 +0,0 @@
-trigger:
-  batch: true
-  branches:
-    include:
-      - devel
-      - stable-*
-
-pr:
-  autoCancel: true
-  branches:
-    include:
-      - devel
-      - stable-*
-
-schedules:
-  - cron: 0 7 * * *
-    displayName: Nightly
-    always: true
-    branches:
-      include:
-        - devel
-        - stable-*
-
-variables:
-  - name: checkoutPath
-    value: ansible
-  - name: coverageBranches
-    value: devel
-  - name: pipelinesCoverage
-    value: coverage
-  - name: entryPoint
-    value: test/utils/shippable/shippable.sh
-  - name: fetchDepth
-    value: 500
-
-resources:
-  containers:
-    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
-
-pool: Standard
-
-stages:
-  - stage: Sanity
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
-            - test: 5
-  - stage: Units
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: units/{0}
-          targets:
-            - test: 2.6
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-          groups:
-            - 1
-            - 2
-  - stage: Windows
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Server {0}
-          testFormat: windows/{0}
-          targets:
-            - test: 2012
-            - test: 2012-R2
-            - test: 2016
-            - test: 2019
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-            - 6
-            - 7
-  - stage: Network
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: network/{0}
-          targets:
-            - test: ''
-  - stage: Remote
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: OS X 10.11
-              test: osx/10.11
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.2
-              test: rhel/8.2
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
-            - name: FreeBSD 12.0
-              test: freebsd/12.0
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-  - stage: Docker
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: linux/{0}
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 30
-              test: fedora30
-            - name: Fedora 31
-              test: fedora31
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-  - stage: AWS
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: aws/{0}
-          targets:
-            - test: 2.7
-            - test: 3.6
-          groups:
-            - 1
-            - 2
-  - stage: vCenter
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: vcenter/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: CloudStack
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: cs/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Tower
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: tower/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Cloud
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: cloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Hetzner
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: hcloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Summary
-    condition: succeededOrFailed()
-    dependsOn:
-      - Sanity
-      - Units
-      - Windows
-      - Network
-      - Remote
-      - Docker
-      - AWS
-      - vCenter
-      - CloudStack
-      - Tower
-      - Cloud
-      - Hetzner
-    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 --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.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-set -o pipefail -eu
-
-output_path="$1"
-
-curl --silent --show-error https://ansible-ci-files.s3.us-east-1.amazonaws.com/codecov/codecov.sh > codecov.sh
-
-for file in "${output_path}"/reports/coverage*.xml; do
-    name="${file}"
-    name="${name##*/}"  # remove path
-    name="${name##coverage=}"  # remove 'coverage=' prefix if present
-    name="${name%.xml}"  # remove '.xml' suffix
-
-    bash codecov.sh \
-        -f "${file}" \
-        -n "${name}" \
-        -X coveragepy \
-        -X gcov \
-        -X fix \
-        -X search \
-        -X xcode \
-        || echo "Failed to upload code coverage report to codecov.io: ${file}"
-done

.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 --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.sh "$(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)"

.cherry_picker.toml

@@ -1,5 +0,0 @@
-team = "ansible"
-repo = "ansible"
-check_sha = "f31421576b00f0b167cdbe61217c31c21a41ac02"  # the very first commit in repo
-fix_commit_msg = false  # Don't replace "#" with "GH-"
-default_branch = "devel"

.coveragerc

@@ -0,0 +1,25 @@
+# This configuration file is used for manual execution of coverage
+# as well as for tests run through ansible-test.
+
+[run]
+branch = True
+
+# Enable concurrency. This also enables parallel mode, which results in
+# multiple coverage files being created. Concurrency allows us to collect
+# results from multiple tests simultaneously, as well as supporting multiple
+# test runs, such as from integration tests.
+concurrency = multiprocessing
+parallel = True
+
+# When running tests through ansible-test, this option is overridden by
+# the COVERAGE_FILE environment variable. This option is present for
+# convenience when running coverage manually from this directory.
+data_file = test/results/coverage/coverage
+
+# Don't collect or report code coverage from files matching these patterns.
+omit =
+    */python*/dist-packages/*
+    */python*/site-packages/*
+    */python*/distutils/*
+    */pyshared/*
+    */pytest

.gitattributes

@@ -1,2 +1,4 @@
+CHANGELOG.md merge=union
 .github/ export-ignore
 hacking/ export-ignore
+ticket-stubs/ export-ignore

.github/CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Community Code of Conduct
-
-Please see the official [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).

.github/CONTRIBUTING.md

@@ -1,25 +0,0 @@
-# WELCOME TO ANSIBLE GITHUB
-
-Hi! Nice to see you here!
-
-## QUESTIONS ?
-
-Please see the [Community Guide](https://docs.ansible.com/ansible/latest/community/index.html) for information on how to ask questions on the [mailing lists](https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information) and IRC.
-
-The GitHub issue tracker is not the best place for questions for various reasons, but both IRC and the mailing list are very helpful places for those things, as the community page explains best.
-
-## CONTRIBUTING ?
-
-By contributing you agree that these contributions are your own (or approved by your employer) and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the license of the project. You can also read the same [CLA](https://docs.ansible.com/ansible/latest/community/contributor_license_agreement.html) on the Ansible docsite.
-
-Please review the [Community Guide](https://docs.ansible.com/ansible/latest/community/index.html) for more information on contributing to Ansible.
-
-## BUG TO REPORT ?
-
-First and foremost, also check the [Community Guide](https://docs.ansible.com/ansible/latest/community/index.html).
-
-You can report bugs or make enhancement requests at the [Ansible GitHub issue page](http://github.com/ansible/ansible/issues/new/choose) by filling out the issue template that will be presented.
-
-Also please make sure you are testing on the latest released version of Ansible or the development branch; see the [Installation Guide](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) for details.
-
-Thanks!

.github/ISSUE_TEMPLATE.md

@@ -1 +1,63 @@
-Please raise issues via the [new interface](https://github.com/ansible/ansible/issues/new/choose)
+<!---
+Verify first that your issue/request is not already reported on GitHub.
+Also test if the latest release, and master branch are affected too.
+-->
+
+##### ISSUE TYPE
+<!--- Pick one below and delete the rest: -->
+ - Bug Report
+ - Feature Idea
+ - Documentation Report
+
+##### COMPONENT NAME
+<!--- Name of the module/plugin/task/feature -->
+
+##### ANSIBLE VERSION
+<!--- Paste verbatim output from "ansible --version" between quotes below -->
+```
+
+```
+
+##### CONFIGURATION
+<!---
+If using Ansible 2.4 or above, paste the results of "ansible-config dump --only-changed"
+
+Otherwise, mention any settings you have changed/added/removed in ansible.cfg
+(or using the ANSIBLE_* environment variables).
+
+-->
+
+##### OS / ENVIRONMENT
+<!---
+Mention the OS you are running Ansible from, and the OS you are
+managing, or say "N/A" for anything that is not platform-specific.
+Also mention the specific version of what you are trying to control,
+e.g. if this is a network bug the version of firmware on the network device.
+-->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
+
+##### STEPS TO REPRODUCE
+<!---
+For bugs, show exactly how to reproduce the problem, using a minimal test-case.
+For new features, show how the feature would be used.
+-->
+
+<!--- Paste example playbooks or commands between quotes below -->
+```yaml
+
+```
+
+<!--- You can also paste gist.github.com links for larger files -->
+
+##### EXPECTED RESULTS
+<!--- What did you expect to happen when running the steps above? -->
+
+##### ACTUAL RESULTS
+<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
+
+<!--- Paste verbatim command output between quotes below -->
+```
+
+```

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,54 +0,0 @@
----
-name: 🐛 Bug report
-about: Create a report to help us improve
----
-<!--- Verify first that your issue is not already reported on GitHub -->
-<!--- Also test if the latest release and devel branch are affected too -->
-<!--- Complete *all* sections as described, this form is processed automatically -->
-
-##### SUMMARY
-<!--- Explain the problem briefly below -->
-
-##### ISSUE TYPE
-- Bug Report
-
-##### COMPONENT NAME
-<!--- Write the short name of the module, plugin, task or feature below, use your best guess if unsure -->
-
-##### ANSIBLE VERSION
-<!--- Paste verbatim output from "ansible --version" between quotes -->
-```paste below
-
-```
-
-##### CONFIGURATION
-<!--- Paste verbatim output from "ansible-config dump --only-changed" between quotes -->
-```paste below
-
-```
-
-##### OS / ENVIRONMENT
-<!--- Provide all relevant information below, e.g. target OS versions, network device firmware, etc. -->
-
-
-##### STEPS TO REPRODUCE
-<!--- Describe exactly how to reproduce the problem, using a minimal test-case -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- HINT: You can paste gist.github.com links for larger files -->
-
-##### EXPECTED RESULTS
-<!--- Describe what you expected to happen when running the steps above -->
-
-
-##### ACTUAL RESULTS
-<!--- Describe what actually happened. If possible run with extra verbosity (-vvvv) -->
-
-<!--- Paste verbatim command output between quotes -->
-```paste below
-
-```

.github/ISSUE_TEMPLATE/documentation_report.md

@@ -1,38 +0,0 @@
----
-name: 📝 Documentation Report
-about: Ask us about docs
----
-<!--- Verify first that your improvement is not already reported on GitHub -->
-<!--- Also test if the latest release and devel branch are affected too -->
-<!--- Complete *all* sections as described, this form is processed automatically -->
-
-##### SUMMARY
-<!--- Explain the problem briefly below, add suggestions to wording or structure -->
-
-<!--- HINT: Did you know the documentation has an "Edit on GitHub" link on every page ? -->
-
-##### ISSUE TYPE
-- Documentation Report
-
-##### COMPONENT NAME
-<!--- Write the short name of the rst file, module, plugin, task or feature below, use your best guess if unsure -->
-
-##### ANSIBLE VERSION
-<!--- Paste verbatim output from "ansible --version" between quotes -->
-```paste below
-
-```
-
-##### CONFIGURATION
-<!--- Paste verbatim output from "ansible-config dump --only-changed" between quotes -->
-```paste below
-
-```
-
-##### OS / ENVIRONMENT
-<!--- Provide all relevant information below, e.g. OS version, browser, etc. -->
-
-##### ADDITIONAL INFORMATION
-<!--- Describe how this improves the documentation, e.g. before/after situation or screenshots -->
-
-<!--- HINT: You can paste gist.github.com links for larger files -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,25 +0,0 @@
----
-name: ✨ Feature request
-about: Suggest an idea for this project
----
-<!--- Verify first that your feature was not already discussed on GitHub -->
-<!--- Complete *all* sections as described, this form is processed automatically -->
-
-##### SUMMARY
-<!--- Describe the new feature/improvement briefly below -->
-
-##### ISSUE TYPE
-- Feature Idea
-
-##### COMPONENT NAME
-<!--- Write the short name of the module, plugin, task or feature below, use your best guess if unsure -->
-
-##### ADDITIONAL INFORMATION
-<!--- Describe how the feature would be used, why it is needed and what it would solve -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- HINT: You can also paste gist.github.com links for larger files -->

.github/ISSUE_TEMPLATE/security_bug_report.md

@@ -1,8 +0,0 @@
----
-name: 🔥 Security bug report
-about: How to report security vulnerabilities
----
-
-For all security related bugs, email security@ansible.com instead of using this issue tracker and you will receive a prompt response.
-
-For more information, see https://docs.ansible.com/ansible/latest/community/reporting_bugs_and_features.html

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,37 @@
 ##### SUMMARY
-<!--- Describe the change below, including rationale and design decisions -->
+<!--- Describe the change, including rationale and design decisions -->
 
-<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
+<!---
+If you are fixing an existing issue, please include "Fixes #nnn" in your
+commit message and your description; but you should still explain what
+the change does.
+-->
 
 ##### ISSUE TYPE
-<!--- Pick one below and delete the rest -->
-- Bugfix Pull Request
-- Docs Pull Request
-- Feature Pull Request
-- New Module Pull Request
+<!--- Pick one below and delete the rest: -->
+ - Feature Pull Request
+ - New Module Pull Request
+ - Bugfix Pull Request
+ - Docs Pull Request
 
 ##### COMPONENT NAME
-<!--- Write the short name of the module, plugin, task or feature below -->
+<!--- Name of the module/plugin/module/task -->
 
-##### ADDITIONAL INFORMATION
-<!--- Include additional information to help people understand the change here -->
-<!--- A step-by-step reproduction of the problem is helpful if there is no related issue -->
-
-<!--- Paste verbatim command output below, e.g. before and after your change -->
-```paste below
+##### ANSIBLE VERSION
+<!--- Paste verbatim output from "ansible --version" between quotes below -->
+```
+
+```
+
+
+##### ADDITIONAL INFORMATION
+<!---
+Include additional information to help people understand the change here.
+For bugs that don't have a linked bug report, a step-by-step reproduction
+of the problem is helpful.
+  -->
+
+<!--- Paste verbatim command output below, e.g. before and after your change -->
+```
 
 ```

.github/SECURITY.md

@@ -1,15 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Ansible applies security fixes according to the 3-versions-back support
-policy. Please find more information in [our docs](
-https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#release-status
-).
-
-## Reporting a Vulnerability
-
-We encourage responsible disclosure practices for security
-vulnerabilities. Please read our [policies for reporting bugs](
-https://docs.ansible.com/ansible/devel/community/reporting_bugs_and_features.html#reporting-a-bug
-) if you want to report a security issue that might affect Ansible.

.gitignore

@@ -17,8 +17,6 @@ rpm-build
 .idea
 #IntelliJ IDEA stuff..
 *.iml
-#VSCode stuff..
-.vscode/
 # Mac OS X stuff...
 .DS_Store
 # manpage build stuff...
@@ -29,24 +27,30 @@ docs/man/man3/*
 *.sublime-project
 *.sublime-workspace
 # docsite stuff...
-docs/docsite/_build
+docs/api/_build/
+docs/api/rst/
 docs/docsite/*.html
-docs/docsite/htmlout
-docs/docsite/rst/cli/ansible-*.rst
-docs/docsite/rst/cli/ansible.rst
-docs/docsite/rst/dev_guide/collections_galaxy_meta.rst
-docs/docsite/rst/dev_guide/testing/sanity/index.rst.new
-docs/docsite/rst/modules/*.rst
-docs/docsite/rst/playbooks_directives.rst
-docs/docsite/rst/plugins_by_category.rst
-docs/docsite/rst/plugins/*/*.rst
-docs/docsite/rst/reference_appendices/config.rst
-docs/docsite/rst/reference_appendices/playbooks_keywords.rst
-docs/docsite/rst_warnings
-docs/docsite/searchindex.js
+docs/docsite/_build
 docs/docsite/_static/*.gif
 docs/docsite/_static/*.png
 docs/docsite/_static/websupport.js
+docs/docsite/htmlout
+docs/docsite/searchindex.js
+docs/docsite/rst_warnings
+docs/docsite/rst/*_module.rst
+docs/docsite/rst/ansible.rst
+docs/docsite/rst/ansible-*.rst
+docs/docsite/rst/community_maintained.rst
+docs/docsite/rst/config.rst
+docs/docsite/rst/core_maintained.rst
+docs/docsite/rst/list_of_*.rst
+docs/docsite/rst/modules_by_category.rst
+docs/docsite/rst/network_maintained.rst
+docs/docsite/rst/plugins_by_category.rst
+docs/docsite/rst/partner_maintained.rst
+docs/docsite/rst/playbook_keywords.rst
+docs/docsite/rst/playbooks_directives.rst
+docs/docsite/rst/plugins/*/*.rst
 # deb building stuff...
 /debian/
 deb-build
@@ -57,15 +61,12 @@ credentials.yml
 # test output
 *.retry
 *.out
-.pytest_cache/
 .tox
 .cache
-.pytest_cache
 results.xml
 coverage.xml
 /test/units/cover-html
 /test/integration/targets/*/backup/
-/test/cache/*
 # Development
 /test/develop
 venv
@@ -75,16 +76,21 @@ ansible.egg-info/
 /shippable/
 /test/integration/cloud-config-*.*
 !/test/integration/cloud-config-*.*.template
-.python-version
 # Release directory
 packaging/release/ansible_release
 /.cache/
-/test/results/
-/test/integration/cloud-config-aws.yml
+/test/results/coverage/*=coverage.*
+/test/results/coverage/coverage*
+/test/results/reports/coverage*.xml
+/test/results/reports/coverage*/
+/test/results/bot/*.json
+/test/results/junit/*.xml
+/test/results/logs/*.log
+/test/results/data/*.json
+/test/integration/inventory.remote
 /test/integration/inventory.networking
 /test/integration/inventory.winrm
 /test/integration/cloud-config-aws.yml
-/test/integration/cloud-config-cs.ini
 # python 'rope' stuff
 .ropeproject
 # local 'ack' config files
@@ -96,8 +102,3 @@ htmlcov/
 # ansible-test coverage results
 test/units/.coverage.*
 /test/integration/cloud-config-azure.yml
-/SYMLINK_CACHE.json
-changelogs/.plugin-cache.yaml
-.ansible-test-timeout.json
-# ansible-test temporary metadata file for use with delgation
-/metadata-*.json

.mailmap

@@ -1,5 +1,5 @@
 Michael DeHaan <michael.dehaan@gmail.com> <michael@ansibleworks.com>
-Michael DeHaan <michael.dehaan@gmail.com> Michael DeHaan <michael@ansibleworks.com>
+Michael DeHaan <michael.dehaan@gmail.com> Michael DeHaan <Michael DeHaan michael@ansibleworks.com>
 Michael DeHaan <michael.dehaan@gmail.com> <michael@ansible.com>
 <bcoca@ansible.com> <brian.coca+git@gmail.com>
 <bcoca@ansible.com> <briancoca+ansible@gmail.com>

CODING_GUIDELINES.md

@@ -1,10 +1,316 @@
 Coding Guidelines
 =================
 
-Hi! Thanks for your interest in contributing to Ansible. We document our Coding Guidelines in the [Developer Guide](https://docs.ansible.com/ansible/devel/dev_guide/). We particularly suggest you review:
+Hi!  Thanks for interest in contributing to Ansible.
 
-* [Contributing your module to Ansible](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_checklist.html)
+Here are some guidelines for contributing code.  The purpose of this document are to establish what we're looking for in code contributions, and to make sure
+new contributions know some of the conventions that we've been using.
 
-* [Development conventions, tips and pitfalls](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_best_practices.html)
+We don't think much of this should be too strange to readers familiar with contributing to Python projects, though it helps if we all get on the same page.
 
-Our [Community Guide](https://docs.ansible.com/ansible/devel/community/) may also help you connect with the community of Ansible developers.
+Language
+========
+
+  * While not all components of Ansible must be in Python, core contributions to the Ansible repo must be written in Python.  This is to maximize the ability of everyone to contribute.
+  * If you want to write non-Python ansible modules or inventory scripts, that's fine, but they are not going to get merged in most likely.  Sorry!!  
+
+PEP 8 and basic style checks
+===========================
+
+  * [PEP 8](https://www.python.org/dev/peps/pep-0008/) is a great Python style guide, which you should read.
+  * PEP 8 must not be strictly followed in all aspects, but most of it is good advice
+  * In particular, we don't really care about line lengths.  Buy a bigger monitor!
+  * To run checks for things we care about, use [ansible-test](http://docs.ansible.com/ansible/dev_guide/testing_pep8.html#running-locally).
+  * Similarly, additional checks can be made with "make pyflakes"
+  * There is no need to submit code changes for PEP 8 and pyflakes fixes, as these break attribution history.  Project leadership will make these periodically.
+  * Do not submit pull requests that simply adjust whitespace in the code
+
+Testing
+=======
+
+  * Much of ansible's testing needs are in integration, not unit tests.  Add module tests there.
+  * That being said, there are unit tests too!
+  * Code written must absolutely pass tests (i.e. "make tests")
+  * You should anticipate any error paths in your code and test down those error paths.
+  * Additions to tests for core code is welcome, but not always possible.  Be sure things are at least well tested manually in that case.
+
+Whitespace
+==========
+
+  * Four space indent is strictly required
+  * Include meaningful whitespace between lines of code
+
+Shebang Lines
+=============
+ 
+  * /usr/bin/scripts should start with '/usr/bin/env python'
+  * module code should still use '/usr/bin/python' as this is replaced automatically by 'ansible_python_interpreter', see the FAQ in the docs for more info.
+
+Comments
+========
+
+  * Readability is one of the most important goals for this project
+  * Comment any non-trivial code where someone might not know why you are doing something in a particular way
+  * Though if something should be commented, that's often a sign someone should write a function
+  * All new functions must have a basic docstring comment
+  * Commenting above a line is preferable to commenting at the end of a line
+
+Classes
+=======
+
+  * With the exception of module code (where inline is better), it is desirable to see classes in their own files.
+  * Classes should generally not cause side effects as soon as they are instantiated, move meaningful behavior to methods rather than constructors.
+ 
+Functions and Methods
+=====================
+
+  * In general, functions should not be 'too long' and should describe a meaningful amount of work
+  * When code gets too nested, that's usually the sign the loop body could benefit from being a function
+  * Parts of our existing code are not the best examples of this at times. 
+  * Functions should have names that describe what they do, along with docstrings
+  * Functions should be named with_underscores
+  * "Don't repeat yourself" is generally a good philosophy
+
+Variables
+=========
+
+  * Use descriptive variable names instead of variables like 'x', unless x is a obvious loop index
+  * Ansible python code uses identifiers like 'ClassesLikeThis and variables_like_this
+  * Module parameters should also use_underscores and not runtogether
+
+Module Security
+===============
+
+  * Modules must take steps to avoid passing user input from the shell and always check return codes
+  * always use module.run_command instead of subprocess or Popen or os.system -- this is mandatory
+  * if you use need the shell you must pass use_unsafe_shell=True to module.run_command
+  * if you do not need the shell, avoid using the shell
+  * any variables that can come from the user input with use_unsafe_shell=True must be wrapped by pipes.quote(x)
+  * downloads of https:// resource urls must import module_utils.urls and use the fetch_url method
+
+Misc Preferences
+================
+
+Use the dict constructor where possible when allocating dictionaries:
+
+    # not this:
+    foo = {
+       'a' : 12,
+       'b' : 34
+    }
+
+    # this:
+    foo = dict(
+       a=12,
+       b=34,
+    )
+
+Do not line up variables
+
+    # not this
+    a        = 12
+    foosball = 34
+    xyz      = 'dog'
+
+    # this
+    a = 12
+    foosball = 34
+    xyz = 'dog'
+
+Don't use line continuations:
+
+    # no
+    if (this_is_a_very_long_line and foo and \
+       i_am_going_to_continue_it):
+          bar()
+
+    # better:
+    if (this_is_a_very_long_line and foo and i_am_going_to_continue_it):
+       bar()
+
+Spacing:
+
+    # no
+    x = [1,2,3]
+
+    # no
+    x = [ 1, 2, 3 ]
+
+    # yes
+    x = [1, 2, 3]
+
+Spacing continued:
+
+    # no
+    x=foo(12)
+
+    # no
+    x = foo( 12 )
+
+    # yes
+    x = foo(12)
+
+Licenses
+========
+
+Every file should have a license header, including the copyright of the original author.  Major additions to the module are allowed
+to add an additional copyright line, and this is especially true of rewrites, but original authorship copyright messages should be preserved.
+
+All contributions to the core repo should preserve original licenses and new contributions must include the GPLv3 header.
+
+Module Documentation
+====================
+
+All module pull requests must include a DOCUMENTATION docstring (YAML format, 
+see other modules for examples) as well as an EXAMPLES docstring, which is free form.  
+
+When adding new modules, any new parameter must have a "version_added" attribute.  
+When submitting a new module, the module should have a "version_added" attribute in the 
+pull request as well, set to the current development version.
+
+Be sure to check grammar and spelling.
+
+It's frequently the case that modules get submitted with YAML that isn't valid, 
+so you can run "make webdocs" from the checkout to preview your module's documentation. 
+If it fails to build, take a look at your DOCUMENTATION string 
+or you might have a Python syntax error in there too.
+
+Python Imports
+==============
+
+To make it clear what a module is importing, imports should not be sprinkled throughout the code. 
+
+Python Imports should happen at the top of the file, exempting code from module_utils.
+
+When a conditional runtime import is required, do so something like this instead:
+
+    HAS_FOO = False
+    try:
+       import foo
+       HAS_FOO = True
+    except ImportError:
+       pass
+
+    ...
+
+    if not HAS_FOO:
+       raise Exception("the foo library is required")
+
+This makes it clear what optional dependencies are but allows this to be deferred until runtime.   In the case of module code, the raising of the Exception will be replaced
+with a "module.exit_json" call.
+
+Exceptions
+==========
+
+In the main body of the code, use typed exceptions where possible:
+    
+    # not this
+    raise Exception("panic!")
+
+    # this
+    from ansible import errors
+    ...
+    raise errors.AnsibleError("panic!")
+
+Similarly, exception checking should be fine grained:
+
+    # not this
+    try:
+       foo()
+    except:
+       bar()
+
+    # but this
+    try:
+       foo()
+    except SomeTypedException:
+       bar()
+
+List Comprehensions
+===================
+
+In general list comprehensions are always preferred to map() and filter() calls.
+
+However, they can be abused.  Optimize for readability, and avoid nesting them too deeply.
+
+Regexes
+=======
+
+There is a time and place for them, but here's an illustrative joke.
+
+"A developer had a problem, and used a regular expression to solve it.  Now the developer had two problems".
+
+Often regexes are difficult to maintain, and a trusty call to other string operations can be a great solution, faster,
+and more readable.
+
+File Conventions
+================
+
+If a piece of code looks for a named YAML file in a directory, it should assume it can take no extension, or an extension of '.yml' or '.yaml'.
+This should be true against all code that loads files.
+
+Any code that uses directories should consider the possibility that the directory may be symlink.
+
+New Ansible language parameters
+===============================
+
+If adding a new parameter, like 'can_fizzbuzz: True/False' be sure the value of the parameter is templated somewhere in the Runner code, as if anything can be parameterized in Ansible,
+there is a user that will try to parameterize it.
+
+String Find
+===========
+
+Use 'in':
+
+    # not this:
+    if x.find('foo') != -1:
+
+    # this: 
+    if 'foo' in x:
+
+String checks
+=============
+
+To test if something is a string, consider that it may be unicode.
+
+    # no
+    if type(x) == str:
+
+    # yes
+    from ansible.module_utils.six import string_types
+    if isinstance(x, string_types):
+
+Cleverness
+==========
+
+Ansible's code is intended to be read by as many people as possible, so we don't particularly encourage clever or heavily idiomatic code.
+
+In particular, metaclasses are probably not appropriate, however entertaining they may be to add.
+
+Git Practices
+=============
+
+Pull requests cannot be accepted that contain merge commits.
+
+Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge".
+
+Always create a new branch for each pull request to avoid intertwingling different features or fixes on the same branch.
+
+   
+Python Version Compliance
+=========================
+
+All code in Ansible core must support a minimum version of Python 2.6.
+
+Module code must support a minimum of Python 2.4, with occasional exception for modules that require code that themselves require 2.6 and later.
+
+A quick reminder is that list comprehensions in Python 2.4 are not as fully fleshed out, there are no 'dict' comprehensions, and there is no 'with' statement.
+But otherwise it's pretty much all the same.
+
+The End
+=======
+
+This was not meant to be a scary document, so we hope it wasn't, but we also hope this helps you write code that is easier to maintain by others in the future.
+If you have questions about this document, please ask on the ansible-devel mailing list.
+
+Thank you!

CONTRIBUTING.md

@@ -0,0 +1,29 @@
+# WELCOME TO ANSIBLE GITHUB
+
+Hi! Nice to see you here!
+
+
+## QUESTIONS ?
+
+Please see the [community page](http://docs.ansible.com/community.html) for information on how to ask questions on the [mailing lists](http://docs.ansible.com/community.html#mailing-list-information) and IRC.
+
+The GitHub issue tracker is not the best place for questions for various reasons, but both IRC and the mailing list are very helpful places for those things, as the community page explains best.
+
+
+## CONTRIBUTING ?
+
+Please see the [community page](http://docs.ansible.com/community.html) for information regarding the contribution process. Important license agreement information is also included on that page.
+
+
+## BUG TO REPORT ?
+
+First and foremost, also check the [community page](http://docs.ansible.com/community.html).
+
+You can report bugs or make enhancement requests at the [Ansible GitHub issue page](http://github.com/ansible/ansible/issues/new) by filling out the issue template that will be presented.
+
+Also please make sure you are testing on the latest released version of Ansible or the development branch. You can find the latest releases and development branch at:
+
+- https://github.com/ansible/ansible/releases
+- https://github.com/ansible/ansible/archive/devel.tar.gz
+
+Thanks!

MANIFEST.in

@@ -1,36 +1,21 @@
-include README.rst
-include COPYING
+prune ticket_stubs
+prune hacking
+include README.md COPYING
 include SYMLINK_CACHE.json
 include requirements.txt
-recursive-include docs *
-exclude docs/docsite/rst_warnings
-recursive-exclude docs/docsite/_build *
-recursive-exclude docs/docsite/_extensions *.pyc *.pyo
+include .coveragerc
+include .yamllint
 include examples/hosts
 include examples/ansible.cfg
-include examples/scripts/ConfigureRemotingForAnsible.ps1
-include examples/scripts/upgrade_to_ps3.ps1
-recursive-include lib/ansible/executor/powershell *.ps1
-recursive-include lib/ansible/module_utils/csharp *.cs
-recursive-include lib/ansible/module_utils/powershell *.psm1
-recursive-include lib/ansible/modules/windows *.ps1
-recursive-include lib/ansible/galaxy/data *.yml *.j2 README.md ansible.cfg inventory .git_keep
-recursive-include lib/ansible/config *.yml
-recursive-include licenses *.txt
+recursive-include lib/ansible/module_utils/powershell *
+recursive-include lib/ansible/modules *
+recursive-include lib/ansible/galaxy/data *
+recursive-include docs *
 recursive-include packaging *
-recursive-include test/ansible_test *.py Makefile
-recursive-include test/integration *
-recursive-include test/lib/ansible_test/config *.template
-recursive-include test/lib/ansible_test/_data *.cfg *.ini *.json *.ps1 *.psd1 *.py *.sh *.txt *.yml coveragerc inventory
-recursive-include test/lib/ansible_test/_data/injector ansible ansible-config ansible-connection ansible-console ansible-doc ansible-galaxy ansible-playbook ansible-pull ansible-test ansible-vault pytest
-recursive-include test/lib/ansible_test/_data/sanity/validate-modules validate-modules
-recursive-include test/sanity *.json *.py *.txt
-exclude test/sanity/code-smell/botmeta.*
-recursive-include test/units *
+recursive-include test *
 include Makefile
+include VERSION
 include MANIFEST.in
-include changelogs/CHANGELOG*.rst
+include CHANGELOG.md
 include contrib/README.md
-recursive-include contrib/inventory *.py *.ini *.yml *.yaml
-recursive-include hacking/build_library *.py
-include hacking/build-ansible.py
+recursive-include contrib/inventory *

MODULE_GUIDELINES.md

@@ -1,5 +1,70 @@
 # Module Maintainer Guidelines
 
-The Ansible Module Maintainer Guidelines can now be found in the [official Ansible community guide](https://docs.ansible.com/ansible/latest/community/maintainers.html).
+Thank you for being a maintainer of one Ansible's community modules! This guide provides module maintainers an overview of their responsibilities, resources for additional information, and links to helpful tools.
 
-See also the [Developers Guide](https://docs.ansible.com/ansible/latest/dev_guide/)
+In addition to the information below, module maintainers should be familiar with:
+* General Ansible community development practices (http://docs.ansible.com/ansible/community.html)
+* Documentation on module development (http://docs.ansible.com/ansible/developing_modules.html)
+* Any namespace-specific module guidelines (identified as GUIDELINES.md in the appropriate file tree).
+
+***
+
+# Maintainer Responsibilities
+
+When you contribute a new module to the [ansible/ansible](https://github.com/ansible/ansible) repository, you become the maintainer for that module once it has been merged. Maintainership empowers you with the authority to accept, reject, or request revisions to pull requests on your module -- but as they say, "with great power comes great responsibility."
+
+Maintainers of Ansible modules are expected to provide feedback, responses, or actions on pull requests or issues to the module(s) they maintain in a reasonably timely manner.
+
+It is also recommended that you occasionally revisit the [contribution guidelines](https://github.com/ansible/ansible/blob/devel/CONTRIBUTING.md), as they are continually refined. Occasionally, you may be requested to update your module to move it closer to the general accepted standard requirements. We hope for this to be infrequent, and will always be a request with a fair amount of lead time (ie: not by tomorrow!).
+
+Finally, following the [ansible-devel](https://groups.google.com/forum/#!forum/ansible-devel) mailing list can be a great way to participate in the broader Ansible community, and a place where you can influence the overall direction, quality, and goals of Ansible and its modules. If you're not on this relatively low-volume list, please join us here: https://groups.google.com/forum/#!forum/ansible-devel
+
+The Ansible community hopes that you will find that maintaining your module is as rewarding for you as having the module is for the wider community.
+
+***
+
+# Pull Requests, Issues, and Workflow
+
+## Pull Requests
+
+Module pull requests are located in the [main Ansible repository](https://github.com/ansible/ansible/pulls).
+
+Because of the high volume of pull requests, notification of PRs to specific modules are routed by an automated bot to the appropriate maintainer for handling. It is recommended that you set an appropriate notification process to receive notifications which mention your GitHub ID.
+
+## Issues
+
+Issues for modules, including bug reports, documentation bug reports, and feature requests, are tracked in the [ansible repository](https://github.com/ansible/ansible/issues).
+
+ Issues for modules are routed to their maintainers via an automated process. This process is still being refined, and currently depends upon the issue creator to provide adequate details (specifically, providing the proper module name) in order to route it correctly. If you are a maintainer of a specific module, it is recommended that you periodically search module issues for issues which mention your module's name (or some variation on that name), as well as setting an appropriate notification process for receiving notification of mentions of your GitHub ID.
+
+## PR Workflow
+
+Automated routing of pull requests is handled by a tool called [Ansibullbot](https://github.com/ansible/ansibullbot). (You could say that he moooo-ves things around.)
+
+Being moderately familiar with how the workflow behind the bot operates can be helpful to you, and -- should things go awry -- your feedback can be helpful to the folks that continually help Ansibullbot to evolve.
+
+A detailed explanation of the PR workflow can be seen here: https://github.com/ansible/community/blob/master/PR-FLOW.md
+
+***
+
+# Maintainers list
+
+The full list of maintainers for modules is located here: https://github.com/ansible/ansible/blob/devel/.github/BOTMETA.yml
+
+## Changing Maintainership
+
+Communities change over time, and no one maintains a module forever. If you'd like to propose an additional maintainer for your module, please submit a PR to the maintainers file with the Github username of the new maintainer.
+
+If you'd like to step down as a maintainer, please submit a PR to the maintainers file removing your Github ID from the module in question. If that would leave the module with no maintainers, put "ansible" as the maintainer.  This will indicate that the module is temporarily without a maintainer, and the Ansible community team will search for a new maintainer.
+
+***
+
+# Tools and other Resources
+
+## Useful tools
+* https://ansible.sivel.net/pr/byfile.html -- a full list of all open Pull Requests, organized by file.
+
+## Other Resources
+
+* Ansibullbot: https://github.com/ansible/ansibullbot
+* Triage / pull request workflow and information, including definitions for Labels in GitHub: https://github.com/ansible/community/blob/master/PR-FLOW.md

Makefile

@@ -3,55 +3,44 @@
 # Makefile for Ansible
 #
 # useful targets:
-#   make clean ---------------- clean up
-#   make webdocs -------------- produce ansible doc at docs/docsite/_build/html
 #   make sdist ---------------- produce a tarball
 #   make srpm ----------------- produce a SRPM
 #   make rpm  ----------------- produce RPMs
 #   make deb-src -------------- produce a DEB source
 #   make deb ------------------ produce a DEB
 #   make docs ----------------- rebuild the manpages (results are checked in)
-#   make tests ---------------- run the tests (see https://docs.ansible.com/ansible/devel/dev_guide/testing_units.html for requirements)
+#   make tests ---------------- run the tests (see https://docs.ansible.com/ansible/dev_guide/testing_units.html for requirements)
+#   make pyflakes, make pep8 -- source code checks
 
 ########################################################
 # variable section
 
 NAME = ansible
 OS = $(shell uname -s)
-PREFIX ?= '/usr/local'
-SDIST_DIR ?= 'dist'
 
+# Manpages are currently built with asciidoc -- would like to move to markdown
 # This doesn't evaluate until it's called. The -D argument is the
 # directory of the target file ($@), kinda like `dirname`.
-MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
-ifneq ($(shell which rst2man 2>/dev/null),)
-ASCII2MAN = rst2man $< $@
-else ifneq ($(shell which rst2man.py 2>/dev/null),)
-ASCII2MAN = rst2man.py $< $@
+
+MANPAGES ?= $(patsubst %.asciidoc.in,%,$(wildcard ./docs/man/man1/ansible*.1.asciidoc.in))
+ifneq ($(shell which a2x 2>/dev/null),)
+ASCII2MAN = a2x -L -D $(dir $@) -d manpage -f manpage $<
+ASCII2HTMLMAN = a2x -L -D docs/html/man/ -d manpage -f xhtml
 else
-ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1
 endif
+GENERATE_CLI = docs/bin/generate_man.py
 
 PYTHON=python
-GENERATE_CLI = hacking/build-ansible.py generate-man
-
 SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-# fetch version from project release.py as single source-of-truth
-VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --raw || echo error)
-ifeq ($(findstring error,$(VERSION)), error)
-$(error "version_helper failed")
-endif
-
-MAJOR_VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --majorversion)
-CODENAME := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --codename)
-
-# if a specific release was not requested, set to 1 (RPMs have "fancier" logic for this further down)
-RELEASE ?= 1
+# VERSION file provides one place to update the software version
+VERSION := $(shell cat VERSION | cut -f1 -d' ')
+RELEASE := $(shell cat VERSION | cut -f2 -d' ')
 
 # Get the branch information from git
 ifneq ($(shell which git),)
-GIT_DATE := $(shell git log -n 1 --format="%ci")
+GIT_DATE := $(shell git log -n 1 --format="%ai")
 GIT_HASH := $(shell git log -n 1 --format="%h")
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[-_.\/]//g')
 GITINFO = .$(GIT_HASH).$(GIT_BRANCH)
@@ -60,7 +49,7 @@ GITINFO = ""
 endif
 
 ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
-DATE := $(shell date -j -r $(shell git log -n 1 --format="%ct") +%Y%m%d%H%M)
+DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
 CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}')
 else
 DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
@@ -73,16 +62,15 @@ DEBUILD_OPTS = --source-option="-I"
 DPUT_BIN ?= dput
 DPUT_OPTS ?=
 DEB_DATE := $(shell LC_TIME=C date +"%a, %d %b %Y %T %z")
-DEB_VERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debversion)
 ifeq ($(OFFICIAL),yes)
-    DEB_RELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debrelease)ppa
+    DEB_RELEASE = $(RELEASE)ppa
     # Sign OFFICIAL builds using 'DEBSIGN_KEYID'
     # DEBSIGN_KEYID is required when signing
     ifneq ($(DEBSIGN_KEYID),)
         DEBUILD_OPTS += -k$(DEBSIGN_KEYID)
     endif
 else
-    DEB_RELEASE ?= 100.git$(DATE)$(GITINFO)
+    DEB_RELEASE = 100.git$(DATE)$(GITINFO)
     # Do not sign unofficial builds
     DEBUILD_OPTS += -uc -us
     DPUT_OPTS += -u
@@ -102,7 +90,7 @@ PBUILDER_OPTS ?= --debootstrapopts --variant=buildd --architecture $(PBUILDER_AR
 RPMSPECDIR= packaging/rpm
 RPMSPEC = $(RPMSPECDIR)/ansible.spec
 RPMDIST = $(shell rpm --eval '%{?dist}')
-
+RPMRELEASE = $(RELEASE)
 ifneq ($(OFFICIAL),yes)
     RPMRELEASE = 100.git$(DATE)$(GITINFO)
 endif
@@ -110,22 +98,14 @@ ifeq ($(PUBLISH),nightly)
     # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots
     RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH)
 endif
-
-RPMVERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --baseversion)
-RPMRELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --rpmrelease)
-RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)$(REPOTAG)"
+RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
 
 # MOCK build parameters
 MOCK_BIN ?= mock
 MOCK_CFG ?=
 
-# dynamically add repotag define only if specified
-ifneq ($(REPOTAG),)
-    EXTRA_RPM_DEFINES += --define "repotag $(REPOTAG)"
-endif
-
 # ansible-test parameters
-ANSIBLE_TEST ?= bin/ansible-test
+ANSIBLE_TEST ?= test/runner/ansible-test
 TEST_FLAGS ?=
 
 # ansible-test units parameters (make test / make test-py3)
@@ -161,17 +141,28 @@ integration:
 authors:
 	sh hacking/authors.sh
 
-# Regenerate %.1.rst if %.1.rst.in has been modified more
-# recently than %.1.rst.
-%.1.rst: %.1.rst.in
+# Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more
+# recently than %.1.asciidoc.
+%.1.asciidoc: %.1.asciidoc.in
 	sed "s/%VERSION%/$(VERSION)/" $< > $@
-	rm $<
 
-# Regenerate %.1 if %.1.rst or release.py has been modified more
-# recently than %.1. (Implicitly runs the %.1.rst recipe)
-%.1: %.1.rst lib/ansible/release.py
+# Regenerate %.1 if %.1.asciidoc or VERSION has been modified more
+# recently than %.1. (Implicitly runs the %.1.asciidoc recipe)
+%.1: %.1.asciidoc VERSION
 	$(ASCII2MAN)
 
+.PHONY: loc
+loc:
+	sloccount lib library bin
+
+.PHONY: pep8
+pep8:
+	$(ANSIBLE_TEST) sanity --test pep8 --python $(PYTHON_VERSION) $(TEST_FLAGS)
+
+.PHONY: pyflakes
+pyflakes:
+	pyflakes lib/ansible/*.py lib/ansible/*/*.py bin/*
+
 .PHONY: clean
 clean:
 	@echo "Cleaning up distutils stuff"
@@ -186,7 +177,7 @@ clean:
 	find . -type f \( -name "*.swp" \) -delete
 	@echo "Cleaning up manpage stuff"
 	find ./docs/man -type f -name "*.xml" -delete
-	find ./docs/man -type f -name "*.rst" -delete
+	find ./docs/man -type f -name "*.asciidoc" -delete
 	find ./docs/man/man3 -type f -name "*.3" -delete
 	rm -f ./docs/man/man1/*
 	@echo "Cleaning up output from test runs"
@@ -208,6 +199,7 @@ clean:
 	rm -f AUTHORS.TXT
 	@echo "Cleaning up docsite"
 	$(MAKE) -C docs/docsite clean
+	$(MAKE) -C docs/api clean
 
 .PHONY: python
 python:
@@ -217,46 +209,23 @@ python:
 install:
 	$(PYTHON) setup.py install
 
-install_manpages:
-	gzip -9 $(wildcard ./docs/man/man1/ansible*.1)
-	cp $(wildcard ./docs/man/man1/ansible*.1.gz) $(PREFIX)/man/man1/
-
-.PHONY: sdist_check
-sdist_check:
-	$(PYTHON) packaging/sdist/check-link-behavior.py
-
 .PHONY: sdist
-sdist: sdist_check clean docs
-	_ANSIBLE_SDIST_FROM_MAKEFILE=1 $(PYTHON) setup.py sdist --dist-dir=$(SDIST_DIR)
-
-# Official releases generate the changelog as the last commit before the release.
-# Snapshots shouldn't result in new checkins so the changelog is generated as
-# part of creating the tarball.
-.PHONY: snapshot
-snapshot: sdist_check clean docs changelog
-	_ANSIBLE_SDIST_FROM_MAKEFILE=1 $(PYTHON) setup.py sdist --dist-dir=$(SDIST_DIR)
+sdist: clean docs
+	$(PYTHON) setup.py sdist
 
 .PHONY: sdist_upload
 sdist_upload: clean docs
 	$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
 
-.PHONY: changelog
-changelog:
-	PYTHONPATH=./lib packaging/release/changelogs/changelog.py release -vv && PYTHONPATH=./lib packaging/release/changelogs/changelog.py generate -vv
-
 .PHONY: rpmcommon
 rpmcommon: sdist
 	@mkdir -p rpm-build
 	@cp dist/*.gz rpm-build/
-	@cp $(RPMSPEC) rpm-build/$(NAME).spec
+	@sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPMRELEASE)%{?dist}$(REPOTAG)#' $(RPMSPEC) >rpm-build/$(NAME).spec
 
 .PHONY: mock-srpm
 mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon
-	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/ \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES)
+	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/  --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/
 	@echo "#############################################"
 	@echo "Ansible SRPM is built:"
 	@echo rpm-build/*.src.rpm
@@ -264,11 +233,7 @@ mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon
 
 .PHONY: mock-rpm
 mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm
-	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --rebuild rpm-build/$(NAME)-*.src.rpm \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES)
+	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --rebuild rpm-build/$(NAME)-*.src.rpm
 	@echo "#############################################"
 	@echo "Ansible RPM is built:"
 	@echo rpm-build/*.noarch.rpm
@@ -282,10 +247,6 @@ srpm: rpmcommon
 	--define "_srcrpmdir %{_topdir}" \
 	--define "_specdir $(RPMSPECDIR)" \
 	--define "_sourcedir %{_topdir}" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES) \
 	-bs rpm-build/$(NAME).spec
 	@rm -f rpm-build/$(NAME).spec
 	@echo "#############################################"
@@ -303,10 +264,6 @@ rpm: rpmcommon
 	--define "_sourcedir %{_topdir}" \
 	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
 	--define "__python `which $(PYTHON)`" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES) \
 	-ba rpm-build/$(NAME).spec
 	@rm -f rpm-build/$(NAME).spec
 	@echo "#############################################"
@@ -320,7 +277,7 @@ debian: sdist
 	    mkdir -p deb-build/$${DIST} ; \
 	    tar -C deb-build/$${DIST} -xvf dist/$(NAME)-$(VERSION).tar.gz ; \
 	    cp -a packaging/debian deb-build/$${DIST}/$(NAME)-$(VERSION)/ ; \
-        sed -ie "s|%VERSION%|$(DEB_VERSION)|g;s|%RELEASE%|$(DEB_RELEASE)|;s|%DIST%|$${DIST}|g;s|%DATE%|$(DEB_DATE)|g" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \
+        sed -ie "s|%VERSION%|$(VERSION)|g;s|%RELEASE%|$(DEB_RELEASE)|;s|%DIST%|$${DIST}|g;s|%DATE%|$(DEB_DATE)|g" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \
 	done
 
 .PHONY: deb
@@ -329,12 +286,12 @@ deb: deb-src
 	    PBUILDER_OPTS="$(PBUILDER_OPTS) --distribution $${DIST} --basetgz $(PBUILDER_CACHE_DIR)/$${DIST}-$(PBUILDER_ARCH)-base.tgz --buildresult $(CURDIR)/deb-build/$${DIST}" ; \
 	    $(PBUILDER_BIN) create $${PBUILDER_OPTS} --othermirror "deb http://archive.ubuntu.com/ubuntu $${DIST} universe" ; \
 	    $(PBUILDER_BIN) update $${PBUILDER_OPTS} ; \
-	    $(PBUILDER_BIN) build $${PBUILDER_OPTS} deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \
+	    $(PBUILDER_BIN) build $${PBUILDER_OPTS} deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \
 	done
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
 	done
 	@echo "#############################################"
 
@@ -348,7 +305,7 @@ local_deb: debian
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
 	done
 	@echo "#############################################"
 
@@ -360,42 +317,43 @@ deb-src: debian
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
 	done
 	@echo "#############################################"
 
 .PHONY: deb-upload
 deb-upload: deb
 	@for DIST in $(DEB_DIST) ; do \
-	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
 	done
 
 .PHONY: deb-src-upload
 deb-src-upload: deb-src
 	@for DIST in $(DEB_DIST) ; do \
-	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
 	done
 
 .PHONY: epub
 epub:
-	(cd docs/docsite/; CPUS=$(CPUS) $(MAKE) epub)
+	(cd docs/docsite/; CPUS=$(CPUS) make epub)
 
 # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
 .PHONY: webdocs
 webdocs:
-	(cd docs/docsite/; CPUS=$(CPUS) $(MAKE) docs)
+	(cd docs/docsite/; CPUS=$(CPUS) make docs)
 
-.PHONY: generate_rst
-generate_rst: lib/ansible/cli/*.py
+.PHONY: generate_asciidoc
+generate_asciidoc: lib/ansible/cli/*.py
 	mkdir -p ./docs/man/man1/ ; \
 	PYTHONPATH=./lib $(GENERATE_CLI) --template-file=docs/templates/man.j2 --output-dir=docs/man/man1/ --output-format man lib/ansible/cli/*.py
 
 
-docs: generate_rst
-	$(MAKE) $(MANPAGES)
+docs: generate_asciidoc
+	make $(MANPAGES)
 
 .PHONY: alldocs
 alldocs: docs webdocs
 
 version:
 	@echo $(VERSION)
+

README.md

@@ -0,0 +1,56 @@
+[![PyPI version](https://img.shields.io/pypi/v/ansible.svg)](https://pypi.python.org/pypi/ansible)
+[![Build Status](https://api.shippable.com/projects/573f79d02a8192902e20e34b/badge?branch=devel)](https://app.shippable.com/projects/573f79d02a8192902e20e34b)
+
+
+Ansible
+=======
+
+Ansible is a radically simple IT automation system.  It handles configuration-management, application deployment, cloud provisioning, ad-hoc task-execution, and multinode orchestration - including trivializing things like zero downtime rolling updates with load balancers.
+
+Read the documentation and more at https://ansible.com/
+
+You can find installation instructions [here](https://docs.ansible.com/ansible/intro_installation.html) for a variety of platforms. Most users should probably install a released version of Ansible from `pip`, a package manager or our [release repository](https://releases.ansible.com/ansible/). [Officially supported](https://www.ansible.com/ansible-engine) builds of Ansible are also available. Some power users run directly from the development branch - while significant efforts are made to ensure that `devel` is reasonably stable, you're more likely to encounter breaking changes when running Ansible this way.
+
+Design Principles
+=================
+
+   * Have a dead simple setup process and a minimal learning curve
+   * Manage machines very quickly and in parallel
+   * Avoid custom-agents and additional open ports, be agentless by leveraging the existing SSH daemon
+   * Describe infrastructure in a language that is both machine and human friendly
+   * Focus on security and easy auditability/review/rewriting of content
+   * Manage new remote machines instantly, without bootstrapping any software
+   * Allow module development in any dynamic language, not just Python
+   * Be usable as non-root
+   * Be the easiest IT automation system to use, ever.
+
+Get Involved
+============
+
+   * Read [Community Information](https://docs.ansible.com/community.html) for all kinds of ways to contribute to and interact with the project, including mailing list information and how to submit bug reports and code to Ansible.
+   * All code submissions are done through pull requests.  Take care to make sure no merge commits are in the submission, and use `git rebase` vs `git merge` for this reason.  If submitting a large code change (other than modules), it's probably a good idea to join ansible-devel and talk about what you would like to do or add first and to avoid duplicate efforts.  This not only helps everyone know what's going on, it also helps save time and effort if we decide some changes are needed.
+   * Users list: [ansible-project](https://groups.google.com/group/ansible-project)
+   * Development list: [ansible-devel](https://groups.google.com/group/ansible-devel)
+   * Announcement list: [ansible-announce](https://groups.google.com/group/ansible-announce) - read only
+   * irc.freenode.net: #ansible
+
+Branch Info
+===========
+
+   * Releases are named after Led Zeppelin songs. (Releases prior to 2.0 were named after Van Halen songs.)
+   * The devel branch corresponds to the release actively under development.
+   * Various release-X.Y branches exist for previous releases.
+   * We'd love to have your contributions, read [Community Information](https://docs.ansible.com/community.html) for notes on how to get started.
+
+Authors
+=======
+
+Ansible was created by [Michael DeHaan](https://github.com/mpdehaan) (michael.dehaan/gmail/com) and has contributions from over 1000 users (and growing).  Thanks everyone!
+
+Ansible is sponsored by [Ansible, Inc](https://ansible.com)
+
+License
+=======
+GNU General Public License v3.0
+
+See [COPYING](COPYING) to see the full text.

README.rst

@@ -1,107 +0,0 @@
-|PyPI version| |Docs badge| |Chat badge| |Build Status| |Code Of Conduct| |Mailing Lists| |License|
-
-*******
-Ansible
-*******
-
-Ansible is a radically simple IT automation system. It handles
-configuration management, application deployment, cloud provisioning,
-ad-hoc task execution, network automation, and multi-node orchestration. Ansible makes complex
-changes like zero-downtime rolling updates with load balancers easy. More information on `the Ansible website <https://ansible.com/>`_.
-
-Design Principles
-=================
-
-*  Have a dead simple setup process and a minimal learning curve.
-*  Manage machines very quickly and in parallel.
-*  Avoid custom-agents and additional open ports, be agentless by
-   leveraging the existing SSH daemon.
-*  Describe infrastructure in a language that is both machine and human
-   friendly.
-*  Focus on security and easy auditability/review/rewriting of content.
-*  Manage new remote machines instantly, without bootstrapping any
-   software.
-*  Allow module development in any dynamic language, not just Python.
-*  Be usable as non-root.
-*  Be the easiest IT automation system to use, ever.
-
-Use Ansible
-===========
-
-You can install a released version of Ansible via ``pip``, a package manager, or
-our `release repository <https://releases.ansible.com/ansible/>`_. See our
-`installation guide <https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html>`_ for details on installing Ansible
-on a variety of platforms.
-
-Red Hat offers supported builds of `Ansible Engine <https://www.ansible.com/ansible-engine>`_.
-
-Power users and developers can run the ``devel`` branch, which has the latest
-features and fixes, directly. Although it is reasonably stable, you are more likely to encounter
-breaking changes when running the ``devel`` branch. We recommend getting involved
-in the Ansible community if you want to run the ``devel`` branch.
-
-Get Involved
-============
-
-*  Read `Community
-   Information <https://docs.ansible.com/ansible/latest/community>`_ for all
-   kinds of ways to contribute to and interact with the project,
-   including mailing list information and how to submit bug reports and
-   code to Ansible.
-*  Join a `Working Group
-   <https://github.com/ansible/community/wiki>`_, an organized community devoted to a specific technology domain or platform.
-*  Submit a proposed code update through a pull request to the ``devel`` branch.
-*  Talk to us before making larger changes
-   to avoid duplicate efforts. This not only helps everyone
-   know what is going on, it also helps save time and effort if we decide
-   some changes are needed.
-*  For a list of email lists, IRC channels and Working Groups, see the
-   `Communication page <https://docs.ansible.com/ansible/latest/community/communication.html>`_
-
-Branch Info
-===========
-
-*  The ``devel`` branch corresponds to the release actively under development.
-*  The ``stable-2.X`` branches correspond to stable releases.
-*  Create a branch based on ``devel`` and set up a `dev environment <https://docs.ansible.com/ansible/latest/dev_guide/developing_modules_general.html#common-environment-setup>`_ if you want to open a PR.
-*  See the `Ansible release and maintenance <https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html>`_ page for information about active branches.
-
-Roadmap
-=======
-
-Based on team and community feedback, an initial roadmap will be published for a major or minor version (ex: 2.7, 2.8).
-The `Ansible Roadmap page <https://docs.ansible.com/ansible/devel/roadmap/>`_ details what is planned and how to influence the roadmap.
-
-Authors
-=======
-
-Ansible was created by `Michael DeHaan <https://github.com/mpdehaan>`_
-and has contributions from over 4000 users (and growing). Thanks everyone!
-
-`Ansible <https://www.ansible.com>`_ is sponsored by `Red Hat, Inc.
-<https://www.redhat.com>`_
-
-License
-=======
-
-GNU General Public License v3.0 or later
-
-See `COPYING <COPYING>`_ to see the full text.
-
-.. |PyPI version| image:: https://img.shields.io/pypi/v/ansible.svg
-   :target: https://pypi.org/project/ansible
-.. |Docs badge| image:: https://img.shields.io/badge/docs-latest-brightgreen.svg
-   :target: https://docs.ansible.com/ansible/latest/
-.. |Build Status| image:: https://dev.azure.com/ansible/ansible/_apis/build/status/CI?branchName=stable-2.9
-   :target: https://dev.azure.com/ansible/ansible/_build/latest?definitionId=20&branchName=stable-2.9
-.. |Chat badge| image:: https://img.shields.io/badge/chat-IRC-brightgreen.svg
-   :target: https://docs.ansible.com/ansible/latest/community/communication.html
-.. |Code Of Conduct| image:: https://img.shields.io/badge/code%20of%20conduct-Ansible-silver.svg
-   :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
-   :alt: Ansible Code of Conduct
-.. |Mailing Lists| image:: https://img.shields.io/badge/mailing%20lists-Ansible-orange.svg
-   :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information
-   :alt: Ansible mailing lists
-.. |License| image:: https://img.shields.io/badge/license-GPL%20v3.0-brightgreen.svg
-   :target: COPYING
-   :alt: Repository License

RELEASES.txt

@@ -0,0 +1,84 @@
+Ansible Releases at a Glance
+============================
+
+VERSION  RELEASE     CODE NAME
+++++++++++++++++++++++++++++++
+
+2.4.0    TBD         "Dancing Days"
+2.3.2    2017-08-04  "Ramble On"
+2.3.1    2017-06-01  "Ramble On"
+2.3.0    2017-04-12  "Ramble On"
+2.2.3    2017-05-09  "The Battle of Evermore"
+2.2.2    2017-03-27  "The Battle of Evermore"
+2.2.1    2017-01-16  "The Battle of Evermore"
+2.2.0    2016-11-01  "The Battle of Evermore"
+2.1.6    2017-06-01  "The Song Remains the Same"
+2.1.5    2017-03-27  "The Song Remains the Same"
+2.1.4    2017-01-16  "The Song Remains the Same"
+2.1.3    2016-11-04  "The Song Remains the Same"
+2.1.2    2016-09-29  "The Song Remains the Same"
+2.1.1    2016-07-28  "The Song Remains the Same"
+2.1.0    2016-05-25  "The Song Remains the Same"
+2.0.2    2016-04-19  "Over the Hills and Far Away"
+2.0.1    2016-02-24  "Over the Hills and Far Away"
+2.0.0    2016-01-12  "Over the Hills and Far Away"
+1.9.6    2016-04-15  "Dancing In the Streets"
+1.9.5    2016-03-21  "Dancing In the Streets"
+1.9.4    2015-10-09  "Dancing In the Streets"
+1.9.3    2015-09-03  "Dancing In the Streets"
+1.9.2    2015-06-24  "Dancing In the Streets"
+1.9.1    2015-04-27  "Dancing In the Streets"
+1.9.0    2015-03-25  "Dancing In the Streets"
+1.8.4    2015-02-19  "You Really Got Me"
+1.8.3    2015-02-17  "You Really Got Me"
+1.8.2    2014-12-04  "You Really Got Me"
+1.8.1    2014-11-26  "You Really Got Me"
+1.8.0    2014-11-25  "You Really Got Me"
+1.7.2    2014-09-24  "Summer Nights"
+1.7.1    2014-08-14  "Summer Nights"
+1.7.0    2014-08-06  "Summer Nights"
+1.6.10   2014-07-25  "The Cradle Will Rock"
+1.6.9    2014-07-24  "The Cradle Will Rock"
+1.6.8    2014-07-22  "The Cradle Will Rock"
+1.6.7    2014-07-21  "The Cradle Will Rock"
+1.6.6    2014-07-01  "The Cradle Will Rock"
+1.6.5    2014-06-25  "The Cradle Will Rock"
+1.6.4    2014-06-25  "The Cradle Will Rock"
+1.6.3    2014-06-09  "The Cradle Will Rock"
+1.6.2    2014-05-23  "The Cradle Will Rock"
+1.6.1    2014-05-07  "The Cradle Will Rock"
+1.6.0    2014-05-05  "The Cradle Will Rock"
+1.5.5    2014-04-18  "Love Walks In"
+1.5.4    2014-04-01  "Love Walks In"
+1.5.3    2014-03-13  "Love Walks In"
+1.5.2    2014-03-11  "Love Walks In"
+1.5.1    2014-03-10  "Love Walks In"
+1.5.0    2014-02-28  "Love Walks In"
+1.4.5    2014-02-12  "Could This Be Magic?"
+1.4.4    2014-01-06  "Could This Be Magic?"
+1.4.3    2013-12-20  "Could This Be Magic?"
+1.4.2    2013-12-18  "Could This Be Magic?"
+1.4.1    2013-11-27  "Could This Be Magic?"
+1.4.0    2013-11-21  "Could This Be Magic?"
+1.3.4    2013-10-29  "Top of the World"
+1.3.3    2013-10-09  "Top of the World"
+1.3.2    2013-09-19  "Top of the World"
+1.3.1    2013-09-16  "Top of the World"
+1.3.0    2013-09-13  "Top of the World"
+1.2.3    2013-08-21  "Right Now"
+1.2.2    2013-07-05  "Right Now"
+1.2.1    2013-07-04  "Right Now"
+1.2.0    2013-06-10  "Right Now"
+1.1.0    2013-04-02  "Mean Street"
+1.0.0    2013-02-01  "Eruption"
+0.9.0    2012-11-30  "Dreams"
+0.8.0    2012-10-19  "Cathedral"
+0.7.0    2012-09-06  "Panama"
+0.6.0    2012-08-06  "Cabo"
+0.5.0    2012-07-04  "Amsterdam"
+0.4.0    2012-05-23  "Unchained"
+0.3.0    2012-04-23  "Baluchitherium"
+0.2.0    ?           "Untitled"
+0.1.0    ?           "Untitled"
+0.0.2    ?           "Untitled"
+0.0.1    ?           "Untitled"

ROADMAP.rst

@@ -0,0 +1,28 @@
+*******************************
+Roadmap For Ansible by Red Hat
+*******************************
+This document is now the location for published Ansible Core roadmaps.
+
+The roadmap will be updated by version. Based on team and community feedback, an initial roadmap will be published for a major or minor version (2.0, 2.1).  Subminor versions will generally not have roadmaps published.
+
+2.1 was the first time Ansible has published this and asked for feedback in this manner.  So feedback on the roadmap and the new process is quite welcome.  The team is aiming for further transparency and better inclusion of both community desires and submissions.
+
+These roadmaps are the team's *best guess* roadmaps based on the Ansible team's experience and are also based on requests and feedback from the community.  There are things that may not make it on due to time constraints, lack of community maintainers, etc.  And there may be things that got missed, so each roadmap is published both as an idea of what is upcoming in Ansible, and as a medium for seeking further feedback from the community. Here are the good places for you to submit feedback:
+
+- Add to the agenda of a `Core IRC Meetings <https://github.com/ansible/community/blob/master/meetings/README.md>`_ (preferred)
+- Ansible's google-group: ansible-devel
+- AnsibleFest conferences.
+- IRC freenode channel: #ansible-devel (this one may have things lost in lots of conversation, so a caution).
+
+=======================================
+Current 2.4 Roadmap is open for comment
+=======================================
+We are starting to build the 2.4 Roadmap. We are seeking community feedback! That document is here:
+ - `2.4 Roadmap Document <docs/docsite/rst/roadmap/ROADMAP_2_4.rst>`_
+
+
+
+**Old Roadmaps are found here:**
+ - `2.3 Roadmap Document <docs/docsite/rst/roadmap/ROADMAP_2_3.rst>`_
+ - `2.2 Roadmap Document <docs/docsite/rst/roadmap/ROADMAP_2_2.rst>`_
+ - `2.1 Roadmap Document <docs/docsite/rst/roadmap/ROADMAP_2_1.rst>`_

VERSION

@@ -0,0 +1 @@
+2.5.0 0.0.devel

bin/ansible

@@ -1 +0,0 @@
-../lib/ansible/cli/scripts/ansible_cli_stub.py

bin/ansible

@@ -0,0 +1,145 @@
+#!/usr/bin/env python
+
+# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+########################################################
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+__requires__ = ['ansible']
+try:
+    import pkg_resources
+except Exception:
+    # Use pkg_resources to find the correct versions of libraries and set
+    # sys.path appropriately when there are multiversion installs.  But we
+    # have code that better expresses the errors in the places where the code
+    # is actually used (the deps are optional for many code paths) so we don't
+    # want to fail here.
+    pass
+
+import os
+import shutil
+import sys
+import traceback
+
+from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
+from ansible.module_utils._text import to_text
+
+
+class LastResort(object):
+    # OUTPUT OF LAST RESORT
+    def display(self, msg, log_only=None):
+        print(msg, file=sys.stderr)
+
+    def error(self, msg, wrap_text=None):
+        print(msg, file=sys.stderr)
+
+
+if __name__ == '__main__':
+
+    display = LastResort()
+
+    try:  # bad ANSIBLE_CONFIG or config options can force ugly stacktrace
+        import ansible.constants as C
+        from ansible.utils.display import Display
+    except AnsibleOptionsError as e:
+        display.error(to_text(e), wrap_text=False)
+        sys.exit(5)
+
+    cli = None
+    me = os.path.basename(sys.argv[0])
+
+    try:
+        display = Display()
+        display.debug("starting run")
+
+        sub = None
+        target = me.split('-')
+        if target[-1][0].isdigit():
+            # Remove any version or python version info as downstreams
+            # sometimes add that
+            target = target[:-1]
+
+        if len(target) > 1:
+            sub = target[1]
+            myclass = "%sCLI" % sub.capitalize()
+        elif target[0] == 'ansible':
+            sub = 'adhoc'
+            myclass = 'AdHocCLI'
+        else:
+            raise AnsibleError("Unknown Ansible alias: %s" % me)
+
+        try:
+            mycli = getattr(__import__("ansible.cli.%s" % sub, fromlist=[myclass]), myclass)
+        except ImportError as e:
+            # ImportError members have changed in py3
+            if 'msg' in dir(e):
+                msg = e.msg
+            else:
+                msg = e.message
+            if msg.endswith(' %s' % sub):
+                raise AnsibleError("Ansible sub-program not implemented: %s" % me)
+            else:
+                raise
+
+        try:
+            args = [to_text(a, errors='surrogate_or_strict') for a in sys.argv]
+        except UnicodeError:
+            display.error('Command line args are not in utf-8, unable to continue.  Ansible currently only understands utf-8')
+            display.display(u"The full traceback was:\n\n%s" % to_text(traceback.format_exc()))
+            exit_code = 6
+        else:
+            cli = mycli(args)
+            cli.parse()
+            exit_code = cli.run()
+
+    except AnsibleOptionsError as e:
+        cli.parser.print_help()
+        display.error(to_text(e), wrap_text=False)
+        exit_code = 5
+    except AnsibleParserError as e:
+        display.error(to_text(e), wrap_text=False)
+        exit_code = 4
+# TQM takes care of these, but leaving comment to reserve the exit codes
+#    except AnsibleHostUnreachable as e:
+#        display.error(str(e))
+#        exit_code = 3
+#    except AnsibleHostFailed as e:
+#        display.error(str(e))
+#        exit_code = 2
+    except AnsibleError as e:
+        display.error(to_text(e), wrap_text=False)
+        exit_code = 1
+    except KeyboardInterrupt:
+        display.error("User interrupted execution")
+        exit_code = 99
+    except Exception as e:
+        have_cli_options = cli is not None and cli.options is not None
+        display.error("Unexpected Exception, this is probably a bug: %s" % to_text(e), wrap_text=False)
+        if not have_cli_options or have_cli_options and cli.options.verbosity > 2:
+            log_only = False
+        else:
+            display.display("to see the full traceback, use -vvv")
+            log_only = True
+        display.display(u"the full traceback was:\n\n%s" % to_text(traceback.format_exc()), log_only=log_only)
+        exit_code = 250
+    finally:
+        # Remove ansible tempdir
+        shutil.rmtree(C.DEFAULT_LOCAL_TMP, True)
+
+    sys.exit(exit_code)

bin/ansible-connection

@@ -1 +0,0 @@
-../lib/ansible/cli/scripts/ansible_connection_cli_stub.py

bin/ansible-connection

@@ -0,0 +1,389 @@
+#!/usr/bin/env python
+
+# (c) 2017, Ansible, Inc. <support@ansible.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+########################################################
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+__requires__ = ['ansible']
+
+try:
+    import pkg_resources
+except Exception:
+    pass
+
+import fcntl
+import os
+import shlex
+import signal
+import socket
+import sys
+import time
+import traceback
+import datetime
+import errno
+
+from ansible import constants as C
+from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils.six import PY3
+from ansible.module_utils.six.moves import cPickle
+from ansible.module_utils.connection import send_data, recv_data
+from ansible.playbook.play_context import PlayContext
+from ansible.plugins.loader import connection_loader
+from ansible.utils.path import unfrackpath, makedirs_safe
+from ansible.errors import AnsibleConnectionFailure
+from ansible.utils.display import Display
+
+
+def do_fork():
+    '''
+    Does the required double fork for a daemon process. Based on
+    http://code.activestate.com/recipes/66012-fork-a-daemon-process-on-unix/
+    '''
+    try:
+        pid = os.fork()
+        if pid > 0:
+            return pid
+        # This is done as a 'good practice' for daemons, but we need to keep the cwd
+        # leaving it here as a note that we KNOW its good practice but are not doing it on purpose.
+        # os.chdir("/")
+        os.setsid()
+        os.umask(0)
+
+        try:
+            pid = os.fork()
+            if pid > 0:
+                sys.exit(0)
+
+            if C.DEFAULT_LOG_PATH != '':
+                out_file = open(C.DEFAULT_LOG_PATH, 'ab+')
+                err_file = open(C.DEFAULT_LOG_PATH, 'ab+', 0)
+            else:
+                out_file = open('/dev/null', 'ab+')
+                err_file = open('/dev/null', 'ab+', 0)
+
+            os.dup2(out_file.fileno(), sys.stdout.fileno())
+            os.dup2(err_file.fileno(), sys.stderr.fileno())
+            os.close(sys.stdin.fileno())
+
+            return pid
+        except OSError as e:
+            sys.exit(1)
+    except OSError as e:
+        sys.exit(1)
+
+
+class Server():
+
+    def __init__(self, socket_path, play_context):
+        self.socket_path = socket_path
+        self.play_context = play_context
+
+        display.display(
+            'creating new control socket for host %s:%s as user %s' %
+            (play_context.remote_addr, play_context.port, play_context.remote_user),
+            log_only=True
+        )
+
+        display.display('control socket path is %s' % socket_path, log_only=True)
+        display.display('current working directory is %s' % os.getcwd(), log_only=True)
+
+        self._start_time = datetime.datetime.now()
+
+        display.display("using connection plugin %s" % self.play_context.connection, log_only=True)
+
+        self.connection = connection_loader.get(play_context.connection, play_context, sys.stdin)
+        self.connection._connect()
+
+        if not self.connection.connected:
+            raise AnsibleConnectionFailure('unable to connect to remote host %s' % self._play_context.remote_addr)
+
+        connection_time = datetime.datetime.now() - self._start_time
+        display.display('connection established to %s in %s' % (play_context.remote_addr, connection_time), log_only=True)
+
+        self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self.socket.bind(self.socket_path)
+        self.socket.listen(1)
+        display.display('local socket is set to listening', log_only=True)
+
+    def run(self):
+        try:
+            while True:
+                signal.signal(signal.SIGALRM, self.connect_timeout)
+                signal.signal(signal.SIGTERM, self.handler)
+                signal.alarm(C.PERSISTENT_CONNECT_TIMEOUT)
+
+                (s, addr) = self.socket.accept()
+                display.display('incoming request accepted on persistent socket', log_only=True)
+                signal.alarm(0)
+
+                while True:
+                    data = recv_data(s)
+                    if not data:
+                        break
+
+                    signal.signal(signal.SIGALRM, self.command_timeout)
+                    signal.alarm(self.play_context.timeout)
+
+                    op = to_text(data.split(b':')[0])
+                    display.display('socket operation is %s' % op, log_only=True)
+
+                    method = getattr(self, 'do_%s' % op, None)
+
+                    rc = 255
+                    stdout = stderr = ''
+
+                    if not method:
+                        stderr = 'Invalid action specified'
+                    else:
+                        rc, stdout, stderr = method(data)
+
+                    signal.alarm(0)
+
+                    display.display('socket operation completed with rc %s' % rc, log_only=True)
+
+                    send_data(s, to_bytes(rc))
+                    send_data(s, to_bytes(stdout))
+                    send_data(s, to_bytes(stderr))
+
+                s.close()
+
+        except Exception as e:
+            # socket.accept() will raise EINTR if the socket.close() is called
+            if e.errno != errno.EINTR:
+                display.display(traceback.format_exc(), log_only=True)
+
+        finally:
+            # when done, close the connection properly and cleanup
+            # the socket file so it can be recreated
+            self.shutdown()
+            end_time = datetime.datetime.now()
+            delta = end_time - self._start_time
+            display.display('shutdown local socket, connection was active for %s secs' % delta, log_only=True)
+
+    def connect_timeout(self, signum, frame):
+        display.display('persistent connection idle timeout triggered, timeout value is %s secs' % C.PERSISTENT_CONNECT_TIMEOUT, log_only=True)
+        self.shutdown()
+
+    def command_timeout(self, signum, frame):
+        display.display('command timeout triggered, timeout value is %s secs' % self.play_context.timeout, log_only=True)
+        self.shutdown()
+
+    def handler(self, signum, frame):
+        display.display('signal handler called with signal %s' % signum, log_only=True)
+        self.shutdown()
+
+    def shutdown(self):
+        display.display('shutdown persistent connection requested', log_only=True)
+
+        if not os.path.exists(self.socket_path):
+            display.display('persistent connection is not active', log_only=True)
+            return
+
+        try:
+            if self.socket:
+                display.display('closing local listener', log_only=True)
+                self.socket.close()
+            if self.connection:
+                display.display('closing the connection', log_only=True)
+                self.connection.close()
+        except:
+            pass
+        finally:
+            if os.path.exists(self.socket_path):
+                display.display('removing the local control socket', log_only=True)
+                os.remove(self.socket_path)
+
+        display.display('shutdown complete', log_only=True)
+
+    def do_EXEC(self, data):
+        cmd = data.split(b'EXEC: ')[1]
+        display.display('Command executed: %s' % cmd, log_only=True)
+        return self.connection.exec_command(cmd)
+
+    def do_PUT(self, data):
+        (op, src, dst) = shlex.split(to_native(data))
+        return self.connection.fetch_file(src, dst)
+
+    def do_FETCH(self, data):
+        (op, src, dst) = shlex.split(to_native(data))
+        return self.connection.put_file(src, dst)
+
+    def do_CONTEXT(self, data):
+        pc_data = data.split(b'CONTEXT: ', 1)[1]
+
+        if PY3:
+            pc_data = cPickle.loads(pc_data, encoding='bytes')
+        else:
+            pc_data = cPickle.loads(pc_data)
+
+        pc = PlayContext()
+        pc.deserialize(pc_data)
+
+        try:
+            self.connection.update_play_context(pc)
+        except AttributeError:
+            pass
+
+        return (0, 'ok', '')
+
+    def do_RUN(self, data):
+        timeout = self.play_context.timeout
+        while bool(timeout):
+            if os.path.exists(self.socket_path):
+                break
+            time.sleep(1)
+            timeout -= 1
+        socket_bytes = to_bytes(self.socket_path, errors='surrogate_or_strict')
+        return 0, b'\n#SOCKET_PATH#: %s\n' % socket_bytes, ''
+
+
+def communicate(sock, data):
+    send_data(sock, data)
+    rc = int(recv_data(sock), 10)
+    stdout = recv_data(sock)
+    stderr = recv_data(sock)
+    return (rc, stdout, stderr)
+
+
+def main():
+    # Need stdin as a byte stream
+    if PY3:
+        stdin = sys.stdin.buffer
+    else:
+        stdin = sys.stdin
+
+    try:
+        # read the play context data via stdin, which means depickling it
+        # FIXME: as noted above, we will probably need to deserialize the
+        #        connection loader here as well at some point, otherwise this
+        #        won't find role- or playbook-based connection plugins
+        cur_line = stdin.readline()
+        init_data = b''
+        while cur_line.strip() != b'#END_INIT#':
+            if cur_line == b'':
+                raise Exception("EOF found before init data was complete")
+            init_data += cur_line
+            cur_line = stdin.readline()
+        if PY3:
+            pc_data = cPickle.loads(init_data, encoding='bytes')
+        else:
+            pc_data = cPickle.loads(init_data)
+
+        pc = PlayContext()
+        pc.deserialize(pc_data)
+
+    except Exception as e:
+        # FIXME: better error message/handling/logging
+        sys.stderr.write(traceback.format_exc())
+        sys.exit("FAIL: %s" % e)
+
+    ssh = connection_loader.get('ssh', class_only=True)
+    cp = ssh._create_control_path(pc.remote_addr, pc.port, pc.remote_user, pc.connection)
+
+    # create the persistent connection dir if need be and create the paths
+    # which we will be using later
+    tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR)
+    makedirs_safe(tmp_path)
+    lock_path = unfrackpath("%s/.ansible_pc_lock" % tmp_path)
+    socket_path = unfrackpath(cp % dict(directory=tmp_path))
+
+    # if the socket file doesn't exist, spin up the daemon process
+    lock_fd = os.open(lock_path, os.O_RDWR | os.O_CREAT, 0o600)
+    fcntl.lockf(lock_fd, fcntl.LOCK_EX)
+
+    if not os.path.exists(socket_path):
+        pid = do_fork()
+        if pid == 0:
+            rc = 0
+            try:
+                server = Server(socket_path, pc)
+            except AnsibleConnectionFailure as exc:
+                display.display('connecting to host %s returned an error' % pc.remote_addr, log_only=True)
+                display.display(str(exc), log_only=True)
+                rc = 1
+            except Exception as exc:
+                display.display('failed to create control socket for host %s' % pc.remote_addr, log_only=True)
+                display.display(traceback.format_exc(), log_only=True)
+                rc = 1
+            fcntl.lockf(lock_fd, fcntl.LOCK_UN)
+            os.close(lock_fd)
+            if rc == 0:
+                server.run()
+            sys.exit(rc)
+    else:
+        display.display('re-using existing socket for %s@%s:%s' % (pc.remote_user, pc.remote_addr, pc.port), log_only=True)
+
+    fcntl.lockf(lock_fd, fcntl.LOCK_UN)
+    os.close(lock_fd)
+
+    timeout = pc.timeout
+    while bool(timeout):
+        if os.path.exists(socket_path):
+            display.vvvv('connected to local socket in %s' % (pc.timeout - timeout), pc.remote_addr)
+            break
+        time.sleep(1)
+        timeout -= 1
+    else:
+        raise AnsibleConnectionFailure('timeout waiting for local socket', pc.remote_addr)
+
+    # now connect to the daemon process
+    # FIXME: if the socket file existed but the daemonized process was killed,
+    #        the connection will timeout here. Need to make this more resilient.
+    while True:
+        data = stdin.readline()
+        if data == b'':
+            break
+        if data.strip() == b'':
+            continue
+
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+
+        connect_retry_timeout = C.PERSISTENT_CONNECT_RETRY_TIMEOUT
+        while bool(connect_retry_timeout):
+            try:
+                sock.connect(socket_path)
+                break
+            except socket.error:
+                time.sleep(1)
+                connect_retry_timeout -= 1
+        else:
+            display.display('connect retry timeout expired, unable to connect to control socket', pc.remote_addr, pc.remote_user, log_only=True)
+            display.display('persistent_connect_retry_timeout is %s secs' % (C.PERSISTENT_CONNECT_RETRY_TIMEOUT), pc.remote_addr, pc.remote_user, log_only=True)
+            sys.stderr.write('failed to connect to control socket')
+            sys.exit(255)
+
+        # send the play_context back into the connection so the connection
+        # can handle any privilege escalation activities
+        pc_data = b'CONTEXT: %s' % init_data
+        communicate(sock, pc_data)
+
+        rc, stdout, stderr = communicate(sock, data.strip())
+
+        sys.stdout.write(to_native(stdout))
+        sys.stderr.write(to_native(stderr))
+
+        sock.close()
+        break
+
+    sys.exit(rc)
+
+if __name__ == '__main__':
+    display = Display()
+    main()

bin/ansible-test

@@ -1 +0,0 @@
-../test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py

changelogs/CHANGELOG.rst

@@ -1,6 +0,0 @@
-Placeholder changelog
-=====================
-
-This file is a placeholder; a version-specific ``CHANGELOG-vX.Y.rst`` will be generated during releases from fragments
-under changelogs/fragments. On release branches once a release has been created, consult the branch's version-specific
-file for changes that have occurred in that branch.

changelogs/config.yaml

@@ -1,15 +0,0 @@
----
-release_tag_re: '(v(?:[\d.ab\-]|rc)+)'
-pre_release_tag_re: '(?P<pre_release>(?:[ab]|rc)+\d*)$'
-notesdir: fragments
-prelude_section_name: release_summary
-new_plugins_after_name: removed_features
-sections:
-- ['major_changes', 'Major Changes']
-- ['minor_changes', 'Minor Changes']
-- ['breaking_changes', 'Breaking Changes / Porting Guide']
-- ['deprecated_features', 'Deprecated Features']
-- ['removed_features', 'Removed Features (previously deprecated)']
-- ['security_fixes', 'Security Fixes']
-- ['bugfixes', 'Bugfixes']
-- ['known_issues', 'Known Issues']

changelogs/fragments/1124-pg_hba-dictkey_bugfix.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - postgresql_pg_hba - fix a crash when a new rule with an 'options' field replaces a rule without or vice versa (https://github.com/ansible-collections/community.general/issues/1108).

changelogs/fragments/114_puppet_quote.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "puppet - fix command line construction for check mode and ``manifest:`` (https://github.com/ansible/ansible/issues/60576)."

changelogs/fragments/159_kubectl.yml

@@ -1,2 +0,0 @@
-security_fixes:
-- kubectl - connection plugin now redact kubectl_token and kubectl_password in console log (https://github.com/ansible-collections/community.kubernetes/issues/65) (CVE-2020-1753).

changelogs/fragments/161-ansible-collection-azure-inventory-fixes.yaml

@@ -1,3 +0,0 @@
-bugfixes:
-- azure_rm inventory plugin - update to fetch availability zone information of VM in hostvars.
-  (https://github.com/ansible-collections/azure/issues/161)

changelogs/fragments/16456-correct-YAML-error-message-when-file-load-failed.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - display correct error information when an error exists in the last line of the file (https://github.com/ansible/ansible/issues/16456)

changelogs/fragments/17-postgres_user-no_password_changes-no_log.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- postgres_user - remove false positive ``no_log`` warning for ``no_password_changes`` option (https://github.com/ansible/ansible/issues/68106).

changelogs/fragments/20596-role-param_fix.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- Fixed role's hash_params behavior to not union (https://github.com/ansible/ansible/issues/20596).

changelogs/fragments/211-fix-error-handling-during-tagging-failure.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- ec2_group - Fixes error handling during tagging failures (https://github.com/ansible-collections/amazon.aws/issues/210).

changelogs/fragments/225-mysql_user_fix_no_database_selected.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- mysql_user - fix the error No database selected (https://github.com/ansible/ansible/issues/68070).

changelogs/fragments/29124-has-dead-workers.yaml

@@ -1,4 +0,0 @@
-bugfixes:
-- TaskQueueManager - Ensure ``has_dead_workers`` can function, by using the
-  correct reference, and only allow an exit code of 0.
-  (https://github.com/ansible/ansible/issues/29124)

changelogs/fragments/29264-rabbitmq_policy-add-full-change-check.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - rabbitmq_policy - Add full check for rabbit policy changes (https://github.com/ansible/ansible/issues/29264)

changelogs/fragments/29366-allow-preservation-of-s3-bucket-tags.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - add purge_tags parameter to s3_bucket to allow preservation of existing tags when updating tags.

changelogs/fragments/31238-uri-multi-content-type.yaml

@@ -1,3 +0,0 @@
-bugfixes:
-- uri - Handle multiple Content-Type headers correctly
-  (https://github.com/ansible/ansible/pull/31238)

changelogs/fragments/32143-pause-background-hangs.yml

@@ -1,4 +0,0 @@
-bugfixes:
-  - >
-    pause - Fix indefinite hang when using a pause task on a background
-    process (https://github.com/ansible/ansible/issues/32142)

changelogs/fragments/32386_debconf_password.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- debconf - add a note about no_log=True since module might expose sensitive information to logs (https://github.com/ansible/ansible/issues/32386).

changelogs/fragments/33604-add-service-to-getent-module.yml

@@ -1,2 +0,0 @@
-minor_changes:
-    - getent - add service parameter to getent to lookup specified service

changelogs/fragments/37_ios_vlans_vtp_issue.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - To fix ios_vlans vtp version 2 issue (https://github.com/ansible-collections/cisco.ios/pull/38)

changelogs/fragments/38760-slackware-os-dist.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - facts - account for Slackware OS with ``+`` in the name (https://github.com/ansible/ansible/issues/38760)

changelogs/fragments/412-docker-machine-add-ip-fallback.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-    - docker_machine - fallback to ip subcommand output if IPAddress is missing (https://github.com/ansible-collections/community.general/issues/412).

changelogs/fragments/412-vmware_guest_custom_attributes.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - vmware_guest_custom_attributes - Fixed issue when trying to set a VM custom attribute when there are custom attributes with the same name for other object types (https://github.com/ansible-collections/community.vmware/issues/412).

changelogs/fragments/41240-fix-os_quota-without-cinder.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - "os_quota - fix failure to set compute or network quota when volume service is not available"

changelogs/fragments/42-postgresql_set_add_message_when_parameter_not_found.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- postgresql_set - return a message instead of traceback when a passed parameter has not been found (https://github.com/ansible-collections/community.postgresql/issues/41).

changelogs/fragments/43-postgresql_modules_fix_version_parsing.yml

@@ -1,3 +0,0 @@
-bugfixes:
-- postgresql_ping - fix crash caused by wrong PgSQL version parsing (https://github.com/ansible-collections/community.postgresql/issues/40).
-- postgresql_info - fix crash caused by wrong PgSQL version parsing (https://github.com/ansible-collections/community.postgresql/issues/40).

changelogs/fragments/44624-dnsmadeeasy-fix_locale.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - dnsmadeeasy - force the date to be rendered with C (POSIX system default) locale as English short date names are required by API

changelogs/fragments/44811-xml-insertbefore-and-insertafter-parameters.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-  - xml - Introduce ``insertbefore`` and ``insertafter`` to specify the position (https://github.com/ansible/ansible/pull/44811)

changelogs/fragments/45631-empty-cow-whitelist.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- cowsay - Fix issue with an empty cow_whitelist (https://github.com/ansible/ansible/issues/45631)

changelogs/fragments/45_ios_l3_loopback_issue.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - To fix ios_l3_interfaces Loopback issue (https://github.com/ansible-collections/cisco.ios/pull/45)

changelogs/fragments/46-postgresql_query_fix_decimal_handling.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- postgresql_query - fix decimal handling (https://github.com/ansible-collections/community.postgresql/issues/45).

changelogs/fragments/46458-vmware_cluster_facts-show_tag.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - vmware_cluster_facts now supports tag facts (https://github.com/ansible/ansible/issues/46458).

changelogs/fragments/46461-vmware_host_facts-show_tag.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - vmware_host_facts now supports tag facts (https://github.com/ansible/ansible/issues/46461).

changelogs/fragments/47050-copy_ensure-_original_basename-is-set.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - copy - Fixed copy module not working in case that remote_src is enabled and dest ends in a / (https://github.com/ansible/ansible/pull/47238)

changelogs/fragments/471-no_log.yml

@@ -1,2 +0,0 @@
-security_fixes:
-- aws_secret - flag the ``secret`` parameter as containing sensitive data which shouldn't be logged (https://github.com/ansible-collections/community.aws/pull/471) (CVE-2021-3447).

changelogs/fragments/48010-vmware_datastore_cluster-add_folder.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - Add folder option in vmware_datastore_cluster to place datastore cluster in specific folder (https://github.com/ansible/ansible/issues/48010).

changelogs/fragments/48394-meraki-idempotency-change.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - "meraki_* - Idempotency check has been rewritten. The new version is more thorough."

changelogs/fragments/48820-meraki_network-enable-vlans.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - "meraki_network - Add support for enabling or disabling VLANs on a network."

changelogs/fragments/48971-meraki_network-enable-status-pages.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - meraki_network - Add support for disabling remote status page on a network.

changelogs/fragments/48971-meraki_ssid-docs.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - meraki_ssid - Add examples to documentation.

changelogs/fragments/49568-type-checking.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- "nagios - Removed redundant type check which caused crashes. Guardrails added elsewhere in earlier change."

changelogs/fragments/49808-docker_container-mounts.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- "docker_container - add ``mounts`` option."

changelogs/fragments/49938-vcenter_folder-restrict_folder.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Restrict vcenter_folder to vCenter only, since folder creation api is not supported on ESXi hostsystem (https://github.com/ansible/ansible/issues/49938).

changelogs/fragments/50617-vmware_guest-vapp_settings.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- vApp setting can be set while VM creation in vmware_guest (https://github.com/ansible/ansible/issues/50617).

changelogs/fragments/51-postgresql_query_fix_datetime_timedelta_type_handling.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- postgresql_query - fix datetime.timedelta type handling (https://github.com/ansible-collections/community.postgresql/issues/47).

changelogs/fragments/51489-apt-not-honor-update-cache.yml

@@ -1,4 +0,0 @@
----
-bugfixes:
-- apt - Fixed the issue the cache being updated while auto-installing its
-  dependencies even when ``update_cache`` is set to false.

changelogs/fragments/51531-aws_ses_identity-fix-implicit-region.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-    - aws_ses_identity module works when region is provided using config or environment variables rather than the region parameter (https://github.com/ansible/ansible/issues/51531)

changelogs/fragments/51561-meraki_ssid-fix.yml

@@ -1,3 +0,0 @@
-bugfixes:
-- "meraki_ssid - Provides more accurate change results for some operations."
-- "meraki_ssid - Improved documentation about parameter dependencies."

changelogs/fragments/51995-apt_repository-catch-IOError.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - apt_repository - Fix crash caused by ``cache.update()`` raising an ``IOError`` due to a timeout in ``apt update`` (https://github.com/ansible/ansible/issues/51995)

changelogs/fragments/52936-vmware-proxy-support.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-- vmware - The VMware modules can now access a server behind a HTTP proxy (https://github.com/ansible/ansible/pull/52936)

changelogs/fragments/53179-unixy-implement_display_ok_skipped_hosts.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-    - Implement config options for ``display_ok_hosts`` and ``display_skipped_hosts`` in unixy callback plugin

changelogs/fragments/53372-vmware_guest_facts-add_moid.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Add managed object identifier (moId) and vim reference (vimref) of virtual machine in guest facts (https://github.com/ansible/ansible/issues/53372).

changelogs/fragments/53385-docker-privilege-escalation.yml

@@ -1,4 +0,0 @@
----
-bugfixes:
- - Fix privilege escalation support for the docker connection plugin when
-   credentials need to be supplied (e.g. sudo with password).

changelogs/fragments/53398-fix-ec2_launch_template-tags.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - ec2_launch_template - Only 'volume' and 'instance' are valid resource types for tag specifications.