New release v2.7.18

With collections migration, inventory scripts are moved from devel (2.10).
Point docs for inventory script to their respective version.

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

.cherry_picker.toml

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

@@ -23,3 +23,4 @@ omit =
     */python*/distutils/*
     */pyshared/*
     */pytest
+    */AnsiballZ_*.py

.gitattributes

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

.github/CODE_OF_CONDUCT.md

@@ -1,3 +1,3 @@
 # Community Code of Conduct
 
-Please see the official [Ansible Community Code of Conduct](http://docs.ansible.com/ansible/latest/community.html#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

@@ -0,0 +1,25 @@
+# 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,7 +1,12 @@
 <!---
 Verify first that your issue/request is not already reported on GitHub.
+THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
 Also test if the latest release, and devel branch are affected too.
--->
+ALWAYS add information AFTER (OUTSIDE) these html comments.
+Otherwise it may end up being automatically closed by our bot. -->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
 
 ##### ISSUE TYPE
 <!--- Pick one below and delete the rest -->
@@ -10,40 +15,29 @@ Also test if the latest release, and devel branch are affected too.
  - Documentation Report
 
 ##### COMPONENT NAME
-<!---
-Name of the module, plugin, task or feature
-Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path
--->
+<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
+Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
 
 ##### ANSIBLE VERSION
-<!--- Paste verbatim output from "ansible --version" between quotes below -->
+<!--- Paste, BELOW THIS COMMENT, 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"
+<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, 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).
--->
+(or using the ANSIBLE_* environment variables).-->
 
 ##### OS / ENVIRONMENT
-<!---
-Mention the OS you are running Ansible from, and the OS you are
+<!--- Mention, BELOW THIS COMMENT, 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 -->
+e.g. if this is a network bug the version of firmware on the network device.-->
 
 ##### 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.
--->
+<!--- 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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,61 @@
+---
+name: 🐛 Bug report
+about: Create a report to help us improve
+
+---
+
+<!---
+Verify first that your issue/request is not already reported on GitHub.
+THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
+Also test if the latest release, and devel branch are affected too.
+ALWAYS add information AFTER (OUTSIDE) these html comments.
+Otherwise it may end up being automatically closed by our bot. -->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
+
+##### ISSUE TYPE
+ - Bug Report
+
+##### COMPONENT NAME
+<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
+Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
+
+##### ANSIBLE VERSION
+<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
+```
+
+```
+
+##### CONFIGURATION
+<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, 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, BELOW THIS COMMENT, 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.-->
+
+##### 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/documentation_report.md

@@ -0,0 +1,61 @@
+---
+name: 📝 Documentation Report
+about: Ask us about docs
+
+---
+
+<!---
+Verify first that your issue/request is not already reported on GitHub.
+THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
+Also test if the latest release, and devel branch are affected too.
+ALWAYS add information AFTER (OUTSIDE) these html comments.
+Otherwise it may end up being automatically closed by our bot. -->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
+
+##### ISSUE TYPE
+ - Documentation Report
+
+##### COMPONENT NAME
+<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
+Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
+
+##### ANSIBLE VERSION
+<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
+```
+
+```
+
+##### CONFIGURATION
+<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, 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, BELOW THIS COMMENT, 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.-->
+
+##### 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/feature_request.md

@@ -0,0 +1,61 @@
+---
+name: ✨ Feature request
+about: Suggest an idea for this project
+
+---
+
+<!---
+Verify first that your issue/request is not already reported on GitHub.
+THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
+Also test if the latest release, and devel branch are affected too.
+ALWAYS add information AFTER (OUTSIDE) these html comments.
+Otherwise it may end up being automatically closed by our bot. -->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
+
+##### ISSUE TYPE
+ - Feature Idea
+
+##### COMPONENT NAME
+<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
+Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
+
+##### ANSIBLE VERSION
+<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
+```
+
+```
+
+##### CONFIGURATION
+<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, 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, BELOW THIS COMMENT, 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.-->
+
+##### 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/security_bug_report.md

@@ -0,0 +1,8 @@
+---
+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,11 +1,9 @@
 ##### SUMMARY
 <!--- Describe the change, including rationale and design decisions -->
 
-<!---
-If you are fixing an existing issue, please include "Fixes #nnn" in your
+<!--- 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.
--->
+the change does.-->
 
 ##### ISSUE TYPE
 <!--- Pick one below and delete the rest: -->
@@ -15,7 +13,7 @@ the change does.
  - Docs Pull Request
 
 ##### COMPONENT NAME
-<!--- Name of the module, plugin, module or task -->
+<!--- Name of the module, plugin, task or feature -->
 
 ##### ANSIBLE VERSION
 <!--- Paste verbatim output from "ansible --version" between quotes below -->
@@ -25,11 +23,9 @@ the change does.
 
 
 ##### ADDITIONAL INFORMATION
-<!---
-Include additional information to help people understand the change here.
+<!--- 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.
-  -->
+of the problem is helpful. -->
 
 <!--- Paste verbatim command output below, e.g. before and after your change -->
 ```

.gitignore

@@ -29,31 +29,23 @@ docs/man/man3/*
 *.sublime-project
 *.sublime-workspace
 # docsite stuff...
-docs/api/_build/
-docs/api/rst/
-docs/docsite/*.html
 docs/docsite/_build
+docs/docsite/*.html
+docs/docsite/htmlout
+docs/docsite/rst/cli/ansible-*.rst
+docs/docsite/rst/cli/ansible.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/_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/module_docs/*.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/playbooks_keywords.rst
-docs/docsite/rst/playbooks_directives.rst
-docs/docsite/rst/plugins/*/*.rst
 # deb building stuff...
 /debian/
 deb-build
@@ -64,8 +56,10 @@ credentials.yml
 # test output
 *.retry
 *.out
+.pytest_cache/
 .tox
 .cache
+.pytest_cache
 results.xml
 coverage.xml
 /test/units/cover-html
@@ -80,6 +74,7 @@ ansible.egg-info/
 /shippable/
 /test/integration/cloud-config-*.*
 !/test/integration/cloud-config-*.*.template
+.python-version
 # Release directory
 packaging/release/ansible_release
 /.cache/
@@ -107,3 +102,5 @@ htmlcov/
 # ansible-test coverage results
 test/units/.coverage.*
 /test/integration/cloud-config-azure.yml
+/SYMLINK_CACHE.json
+changelogs/.plugin-cache.yaml

.yamllint

@@ -1 +0,0 @@
-test/sanity/yamllint/config/default.yml

CODING_GUIDELINES.md

@@ -1,316 +1,10 @@
 Coding Guidelines
 =================
 
-Hi!  Thanks for your interest in contributing to Ansible.
+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:
 
-Here are some guidelines for contributing code.  The purpose of this document is to establish what we're looking for in code contributions, and to make sure
-new contributors know some of the conventions that we've been using.
+* [Contributing your module to Ansible](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_checklist.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.
+* [Development conventions, tips and pitfalls](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_best_practices.html)
 
-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.
-  * The line is limited to 160 characters.
-  * 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 are 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 an 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 need to use 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 intermingling 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 exceptions 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!
+Our [Community Guide](https://docs.ansible.com/ansible/devel/community/) may also help you connect with the community of Ansible developers.

CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# WELCOME TO ANSIBLE GITHUB
-
-Hi! Nice to see you here!
-
-
-## QUESTIONS ?
-
-Please see the [community guide](http://docs.ansible.com/ansible/latest/community/index.html) for information on how to ask questions on the [mailing lists](http://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 ?
-
-Please see the [community guide](http://docs.ansible.com/ansible/latest/community/index.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 guide](http://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) 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,12 +1,16 @@
-prune ticket_stubs
-prune hacking
-include README.md COPYING
+include README.rst
+include COPYING
 include SYMLINK_CACHE.json
 include requirements.txt
 include .coveragerc
-include .yamllint
+include shippable.yml
+include tox.ini
+include bin/ansible-test
 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 *
 recursive-include lib/ansible/module_utils/powershell *
 recursive-include lib/ansible/modules *
 recursive-include lib/ansible/galaxy/data *
@@ -15,8 +19,7 @@ recursive-include licenses *
 recursive-include packaging *
 recursive-include test *
 include Makefile
-include VERSION
 include MANIFEST.in
-include CHANGELOG.md
+include changelogs/CHANGELOG*.rst
 include contrib/README.md
 recursive-include contrib/inventory *

MODULE_GUIDELINES.md

@@ -1,3 +1,5 @@
 # Module Maintainer Guidelines
 
-The Ansible Module Maintainer Guidelines can now be found in the [official Ansible community guide](http://docs.ansible.com/ansible/latest/community/maintainers.html).
+The Ansible Module Maintainer Guidelines can now be found in the [official Ansible community guide](https://docs.ansible.com/ansible/latest/community/maintainers.html).
+
+See also the [Developers Guide](https://docs.ansible.com/ansible/latest/dev_guide/)

Makefile

@@ -9,7 +9,7 @@
 #   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/dev_guide/testing_units.html for requirements)
+#   make tests ---------------- run the tests (see https://docs.ansible.com/ansible/devel/dev_guide/testing_units.html for requirements)
 #   make pyflakes, make pep8 -- source code checks
 
 ########################################################
@@ -21,25 +21,34 @@ PREFIX ?= '/usr/local'
 
 # This doesn't evaluate until it's called. The -D argument is the
 # directory of the target file ($@), kinda like `dirname`.
-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
+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 $< $@
 else
-ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1
+ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
 endif
 GENERATE_CLI = docs/bin/generate_man.py
 
 PYTHON=python
 SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-# VERSION file provides one place to update the software version
-VERSION := $(shell cat VERSION | cut -f1 -d' ')
-RELEASE := $(shell cat VERSION | cut -f2 -d' ')
+# 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
 
 # Get the branch information from git
 ifneq ($(shell which git),)
-GIT_DATE := $(shell git log -n 1 --format="%ai")
+GIT_DATE := $(shell git log -n 1 --format="%ci")
 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)
@@ -48,7 +57,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="%at") +%Y%m%d%H%M)
+DATE := $(shell date -j -r $(shell git log -n 1 --format="%ct") +%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)
@@ -61,15 +70,16 @@ 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 = $(RELEASE)ppa
+    DEB_RELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debrelease)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
@@ -89,7 +99,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
@@ -97,14 +107,22 @@ ifeq ($(PUBLISH),nightly)
     # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots
     RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH)
 endif
-RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
+
+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)"
 
 # 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 ?= test/runner/ansible-test
+ANSIBLE_TEST ?= bin/ansible-test
 TEST_FLAGS ?=
 
 # ansible-test units parameters (make test / make test-py3)
@@ -140,14 +158,15 @@ integration:
 authors:
 	sh hacking/authors.sh
 
-# Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more
-# recently than %.1.asciidoc.
-%.1.asciidoc: %.1.asciidoc.in
+# Regenerate %.1.rst if %.1.rst.in has been modified more
+# recently than %.1.rst.
+%.1.rst: %.1.rst.in
 	sed "s/%VERSION%/$(VERSION)/" $< > $@
+	rm $<
 
-# Regenerate %.1 if %.1.asciidoc or VERSION has been modified more
-# recently than %.1. (Implicitly runs the %.1.asciidoc recipe)
-%.1: %.1.asciidoc VERSION
+# 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
 	$(ASCII2MAN)
 
 .PHONY: loc
@@ -176,7 +195,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 "*.asciidoc" -delete
+	find ./docs/man -type f -name "*.rst" -delete
 	find ./docs/man/man3 -type f -name "*.3" -delete
 	rm -f ./docs/man/man1/*
 	@echo "Cleaning up output from test runs"
@@ -198,7 +217,6 @@ clean:
 	rm -f AUTHORS.TXT
 	@echo "Cleaning up docsite"
 	$(MAKE) -C docs/docsite clean
-	$(MAKE) -C docs/api clean
 
 .PHONY: python
 python:
@@ -220,15 +238,23 @@ sdist: clean docs
 sdist_upload: clean docs
 	$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
 
+.PHONY: changelog
+changelog:
+	packaging/release/changelogs/changelog.py release -vv && packaging/release/changelogs/changelog.py generate -vv
+
 .PHONY: rpmcommon
 rpmcommon: sdist
 	@mkdir -p rpm-build
 	@cp dist/*.gz rpm-build/
-	@sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPMRELEASE)%{?dist}$(REPOTAG)#' $(RPMSPEC) >rpm-build/$(NAME).spec
+	@cp $(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/  --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/
+	$(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)
 	@echo "#############################################"
 	@echo "Ansible SRPM is built:"
 	@echo rpm-build/*.src.rpm
@@ -236,7 +262,11 @@ 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/ --rebuild rpm-build/$(NAME)-*.src.rpm
+	$(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)
 	@echo "#############################################"
 	@echo "Ansible RPM is built:"
 	@echo rpm-build/*.noarch.rpm
@@ -250,6 +280,10 @@ 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 "#############################################"
@@ -265,8 +299,12 @@ rpm: rpmcommon
 	--define "_srcrpmdir %{_topdir}" \
 	--define "_specdir $(RPMSPECDIR)" \
 	--define "_sourcedir %{_topdir}" \
-	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+	--define "_rpmfilename $(RPMNVR).%%{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 "#############################################"
@@ -280,7 +318,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%|$(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%|$(DEB_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
@@ -289,12 +327,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)_$(VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \
+	    $(PBUILDER_BIN) build $${PBUILDER_OPTS} deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \
 	done
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
 	done
 	@echo "#############################################"
 
@@ -308,7 +346,7 @@ local_deb: debian
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
 	done
 	@echo "#############################################"
 
@@ -320,43 +358,42 @@ deb-src: debian
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(DEB_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)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_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)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_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_asciidoc
-generate_asciidoc: lib/ansible/cli/*.py
+.PHONY: generate_rst
+generate_rst: 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_asciidoc
-	make $(MANPAGES)
+docs: generate_rst
+	$(MAKE) $(MANPAGES)
 
 .PHONY: alldocs
 alldocs: docs webdocs
 
 version:
 	@echo $(VERSION)
-

README.md

@@ -1,56 +0,0 @@
-[![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

@@ -0,0 +1,113 @@
+|PyPI version| |Docs badge| |Chat badge| |Build Status|
+
+*******
+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/latest/installation_guide/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/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.
+*  All code submissions are done through pull requests to the ``devel`` branch.
+*  Feel free to talk to us before making larger changes
+   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
+*  For the full list of Email Lists, IRC channels see the
+   `Communication page <https://docs.ansible.com/ansible/latest/community/communication.html>`_
+
+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.
+*  The ``stable-2.x`` branches exist for current releases.
+*  Various release-X.Y branches exist for previous releases.
+*  For information about the active branches see the
+   `Ansible release and maintenance <https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html>`_ page.
+*  We'd love to have your contributions, read the `Community
+   Guide <https://docs.ansible.com/ansible/latest/community>`_ for notes on
+   how to get started.
+
+Roadmap
+=======
+
+Based on team and community feedback, an initial roadmap will be published for a major or minor version (ex: 2.0, 2.1).
+Subminor versions will generally not have roadmaps published.
+
+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>`_
+(michael.dehaan/gmail/com) and has contributions from over 3700 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://api.shippable.com/projects/573f79d02a8192902e20e34b/badge?branch=devel
+   :target: https://app.shippable.com/projects/573f79d02a8192902e20e34b
+.. |Chat badge| image:: https://img.shields.io/badge/chat-IRC-brightgreen.svg
+   :target: https://docs.ansible.com/ansible/latest/community/communication.html

RELEASES.txt

@@ -1,88 +0,0 @@
-Ansible Releases at a Glance
-============================
-
-VERSION  RELEASE     CODE NAME
-++++++++++++++++++++++++++++++
-
-2.5.0    TBD         "Kashmir"
-2.4.3    01-31.2018  "Dancing Days"
-2.4.2    11-29-2017  "Dancing Days"
-2.4.1    10-25-2017  "Dancing Days"
-2.4.0    09-19-2017  "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

@@ -1,17 +0,0 @@
-*******************************
-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).
-
-Ansible Roadmaps can be found `here <http://docs.ansible.com/ansible/devel/roadmap/>`_.

VERSION

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

bin/ansible

@@ -157,7 +157,7 @@ if __name__ == '__main__':
         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
+        # Remove ansible tmpdir
         shutil.rmtree(C.DEFAULT_LOCAL_TMP, True)
 
     sys.exit(exit_code)

bin/ansible-connection

@@ -12,16 +12,20 @@ except Exception:
     pass
 
 import fcntl
+import hashlib
 import os
 import signal
 import socket
 import sys
+import time
 import traceback
 import errno
 import json
 
+from contextlib import contextmanager
+
 from ansible import constants as C
-from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_text
 from ansible.module_utils.six import PY3
 from ansible.module_utils.six.moves import cPickle, StringIO
 from ansible.module_utils.connection import Connection, ConnectionError, send_data, recv_data
@@ -33,6 +37,38 @@ from ansible.utils.display import Display
 from ansible.utils.jsonrpc import JsonRpcServer
 
 
+def read_stream(byte_stream):
+    size = int(byte_stream.readline().strip())
+
+    data = byte_stream.read(size)
+    if len(data) < size:
+        raise Exception("EOF found before data was complete")
+
+    data_hash = to_text(byte_stream.readline().strip())
+    if data_hash != hashlib.sha1(data).hexdigest():
+        raise Exception("Read {0} bytes, but data did not match checksum".format(size))
+
+    # restore escaped loose \r characters
+    data = data.replace(br'\r', b'\r')
+
+    return data
+
+
+@contextmanager
+def file_lock(lock_path):
+    """
+    Uses contextmanager to create and release a file lock based on the
+    given path. This allows us to create locks using `with file_lock()`
+    to prevent deadlocks related to failure to unlock properly.
+    """
+
+    lock_fd = os.open(lock_path, os.O_RDWR | os.O_CREAT, 0o600)
+    fcntl.lockf(lock_fd, fcntl.LOCK_EX)
+    yield
+    fcntl.lockf(lock_fd, fcntl.LOCK_UN)
+    os.close(lock_fd)
+
+
 class ConnectionProcess(object):
     '''
     The connection process wraps around a Connection object that manages
@@ -52,7 +88,7 @@ class ConnectionProcess(object):
         self.connection = None
         self._ansible_playbook_pid = ansible_playbook_pid
 
-    def start(self):
+    def start(self, variables):
         try:
             messages = list()
             result = {}
@@ -66,10 +102,12 @@ class ConnectionProcess(object):
                 self.play_context.private_key_file = os.path.join(self.original_path, self.play_context.private_key_file)
             self.connection = connection_loader.get(self.play_context.connection, self.play_context, '/dev/null',
                                                     ansible_playbook_pid=self._ansible_playbook_pid)
-            self.connection.set_options()
+            self.connection.set_options(var_options=variables)
             self.connection._connect()
+
             self.connection._socket_path = self.socket_path
             self.srv.register(self.connection)
+            messages.extend(sys.stdout.getvalue().splitlines())
             messages.append('connection to remote device started successfully')
 
             self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -89,7 +127,7 @@ class ConnectionProcess(object):
             while self.connection.connected:
                 signal.signal(signal.SIGALRM, self.connect_timeout)
                 signal.signal(signal.SIGTERM, self.handler)
-                signal.alarm(C.PERSISTENT_CONNECT_TIMEOUT)
+                signal.alarm(self.connection.get_option('persistent_connect_timeout'))
 
                 self.exception = None
                 (s, addr) = self.sock.accept()
@@ -101,7 +139,7 @@ class ConnectionProcess(object):
                     if not data:
                         break
 
-                    signal.alarm(self.connection._play_context.timeout)
+                    signal.alarm(self.connection.get_option('persistent_command_timeout'))
                     resp = self.srv.handle_request(data)
                     signal.alarm(0)
 
@@ -118,25 +156,33 @@ class ConnectionProcess(object):
                 self.exception = traceback.format_exc()
 
         finally:
-            # when done, close the connection properly and cleanup
-            # the socket file so it can be recreated
+            # allow time for any exception msg send over socket to receive at other end before shutting down
+            time.sleep(0.1)
+
+            # when done, close the connection properly and cleanup the socket file so it can be recreated
             self.shutdown()
 
     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()
+        msg = 'persistent connection idle timeout triggered, timeout value is %s secs.\nSee the timeout setting options in the Network Debug and ' \
+              'Troubleshooting Guide.' % self.connection.get_option('persistent_connect_timeout')
+        display.display(msg, log_only=True)
+        raise Exception(msg)
 
     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()
+        msg = 'command timeout triggered, timeout value is %s secs.\nSee the timeout setting options in the Network Debug and Troubleshooting Guide.'\
+              % self.connection.get_option('persistent_command_timeout')
+        display.display(msg, log_only=True)
+        raise Exception(msg)
 
     def handler(self, signum, frame):
-        display.display('signal handler called with signal %s' % signum, log_only=True)
-        self.shutdown()
+        msg = 'signal handler called with signal %s.' % signum
+        display.display(msg, log_only=True)
+        raise Exception(msg)
 
     def shutdown(self):
         """ Shuts down the local domain socket
         """
+        lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % os.path.split(self.socket_path))
         if os.path.exists(self.socket_path):
             try:
                 if self.sock:
@@ -150,6 +196,10 @@ class ConnectionProcess(object):
                     os.remove(self.socket_path)
                     setattr(self.connection, '_socket_path', None)
                     setattr(self.connection, '_connected', False)
+
+        if os.path.exists(lock_path):
+            os.remove(lock_path)
+
         display.display('shutdown complete', log_only=True)
 
 
@@ -173,22 +223,19 @@ def main():
 
     try:
         # read the play context data via stdin, which means depickling it
-        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()
+        vars_data = read_stream(stdin)
+        init_data = read_stream(stdin)
 
         if PY3:
             pc_data = cPickle.loads(init_data, encoding='bytes')
+            variables = cPickle.loads(vars_data, encoding='bytes')
         else:
             pc_data = cPickle.loads(init_data)
+            variables = cPickle.loads(vars_data)
 
         play_context = PlayContext()
         play_context.deserialize(pc_data)
+        display.verbosity = play_context.verbosity
 
     except Exception as e:
         rc = 1
@@ -207,60 +254,57 @@ def main():
         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))
+        lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % os.path.split(socket_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)
+        with file_lock(lock_path):
+            if not os.path.exists(socket_path):
+                messages.append('local domain socket does not exist, starting it')
+                original_path = os.getcwd()
+                r, w = os.pipe()
+                pid = fork_process()
 
-        if not os.path.exists(socket_path):
-            messages.append('local domain socket does not exist, starting it')
-            original_path = os.getcwd()
-            r, w = os.pipe()
-            pid = fork_process()
+                if pid == 0:
+                    try:
+                        os.close(r)
+                        wfd = os.fdopen(w, 'w')
+                        process = ConnectionProcess(wfd, play_context, socket_path, original_path, ansible_playbook_pid)
+                        process.start(variables)
+                    except Exception:
+                        messages.append(traceback.format_exc())
+                        rc = 1
 
-            if pid == 0:
-                try:
-                    os.close(r)
-                    wfd = os.fdopen(w, 'w')
-                    process = ConnectionProcess(wfd, play_context, socket_path, original_path, ansible_playbook_pid)
-                    process.start()
-                except Exception:
-                    messages.append(traceback.format_exc())
-                    rc = 1
+                    if rc == 0:
+                        process.run()
+                    else:
+                        process.shutdown()
 
-                fcntl.lockf(lock_fd, fcntl.LOCK_UN)
-                os.close(lock_fd)
+                    sys.exit(rc)
 
-                if rc == 0:
-                    process.run()
-
-                sys.exit(rc)
+                else:
+                    os.close(w)
+                    rfd = os.fdopen(r, 'r')
+                    data = json.loads(rfd.read())
+                    messages.extend(data.pop('messages'))
+                    result.update(data)
 
             else:
-                os.close(w)
-                rfd = os.fdopen(r, 'r')
-                data = json.loads(rfd.read())
-                messages.extend(data.pop('messages'))
-                result.update(data)
-
-        else:
-            messages.append('found existing local domain socket, using it!')
-            conn = Connection(socket_path)
-            pc_data = to_text(init_data)
-            try:
-                messages.extend(conn.update_play_context(pc_data))
-            except Exception as exc:
-                # Only network_cli has update_play context, so missing this is
-                # not fatal e.g. netconf
-                if isinstance(exc, ConnectionError) and getattr(exc, 'code', None) == -32601:
-                    pass
-                else:
-                    result.update({
-                        'error': to_text(exc),
-                        'exception': traceback.format_exc()
-                    })
+                messages.append('found existing local domain socket, using it!')
+                conn = Connection(socket_path)
+                conn.set_options(var_options=variables)
+                pc_data = to_text(init_data)
+                try:
+                    messages.extend(conn.update_play_context(pc_data))
+                except Exception as exc:
+                    # Only network_cli has update_play context, so missing this is
+                    # not fatal e.g. netconf
+                    if isinstance(exc, ConnectionError) and getattr(exc, 'code', None) == -32601:
+                        pass
+                    else:
+                        result.update({
+                            'error': to_text(exc),
+                            'exception': traceback.format_exc()
+                        })
 
     messages.append(sys.stdout.getvalue())
     result.update({
@@ -278,6 +322,7 @@ def main():
 
     sys.exit(rc)
 
+
 if __name__ == '__main__':
     display = Display()
     main()

bin/ansible-test

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+"""Primary entry point for ansible-test."""
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import os
+import sys
+
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'runner')))
+    import lib.cli
+    lib.cli.main()

changelogs/CHANGELOG.rst

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

@@ -0,0 +1,13 @@
+---
+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']
+- ['deprecated_features', 'Deprecated Features']
+- ['removed_features', 'Removed Features (previously deprecated)']
+- ['bugfixes', 'Bugfixes']
+- ['known_issues', 'Known Issues']

changelogs/distribution-file-processing.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - distribution - add check to remove incorrect matches of Clear Linux when processing distribution files (https://github.com/ansible/ansible/issues/50009)

changelogs/fragments/15732-wait_for-documentation_fix.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Document Path and Port are mutually exclusive parameters in wait_for module.

changelogs/fragments/16748-docker_container-memory.yaml

@@ -0,0 +1,5 @@
+bugfixes:
+- "docker_container: makes unit parsing for memory sizes more consistent, and
+   fixes idempotency problem when ``kernel_memory`` is set (see
+   https://github.com/ansible/ansible/pull/16748 and
+   https://github.com/ansible/ansible/issues/42692)"

changelogs/fragments/24633-copy-coherency-between-check-normal-mode.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - copy - align invocation in return value between check and normal mode

changelogs/fragments/26937-fix-remove-orphans.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - docker_service - fixed an issue where ``remove_orphans`` doesn't work reliably.

changelogs/fragments/32738-native-jinja-types.yaml

@@ -0,0 +1,2 @@
+major_changes:
+- Allow config to enable native jinja types (https://github.com/ansible/ansible/pull/32738)

changelogs/fragments/33156-vmware_guest-resource_pool.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- Rewrite get_resource_pool method for correct resource_pool selection.

changelogs/fragments/33239-sensu-expire-cast-int.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- sensu_silence - Cast int for expire field to avoid call failure to sensu API.

changelogs/fragments/33579-docker_container-log_driver.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Allow arbitrary ``log_driver`` for docker_container (https://github.com/ansible/ansible/pull/33579)."

changelogs/fragments/34863-rabbitmq_user_unpack_fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- Ignore empty result of rabbitmqctl list_user_permissions.

changelogs/fragments/35120-redis_inventory_plugin_flush_cache.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- Only delete host key from redis in-memory cache if present.

changelogs/fragments/36811-fix-lvol-valueerror-with-float-size.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - lvol - fixed ValueError when using float size (https://github.com/ansible/ansible/issues/32886, https://github.com/ansible/ansible/issues/29429)

changelogs/fragments/38679-vmware_guest-refactor_disk_logic.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- Refactor virtual machine disk logic.

changelogs/fragments/39301-dnsimple_keyerror_record-type.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- dnsimple - fixed a KeyError exception related to record types handling.

changelogs/fragments/40092-mysql_user-match-backticks.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "mysql_user: match backticks, single and double quotes when checking user privileges."

changelogs/fragments/42042-inventory_with_no_region.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- plugins/inventory/openstack.py - Do not create group with empty name if region is not set

changelogs/fragments/42170-acme-backend-selection.yaml

@@ -0,0 +1,8 @@
+---
+minor_changes:
+- "The acme_account and acme_certificate modules now support two backends:
+   the Python cryptograpy module or the OpenSSL binary. By default, the
+   modules detect if a new enough cryptography module is available and
+   use it, with the OpenSSL binary being a fallback. If the detection
+   fails for some reason, the OpenSSL binary backend can be explicitly
+   selected by setting select_crypto_backend to openssl."

changelogs/fragments/42322-nmcli_fix_vlan_mod_function.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "nmcli - fix syntax of vlan modification command (https://github.com/ansible/ansible/issues/42322)"

changelogs/fragments/42380-docker_container-check-mode.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "fixes docker_container check and debug mode (https://github.com/ansible/ansible/pull/42380)"

changelogs/fragments/42456-consul_kv-lookup.yaml

@@ -0,0 +1,3 @@
+minor_changes:
+  - added capability to set the scheme for the consul_kv lookup.
+  - added optional certificate and certificate verification for consul_kv lookups

changelogs/fragments/42641-44812-docker-env-variables.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "The docker_* modules respect the DOCKER_* environment variables again (https://github.com/ansible/ansible/pull/42641)."

changelogs/fragments/42647-win_updates.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- win_updates - fixed module return value is lost in error in some cases (https://github.com/ansible/ansible/pull/42647)

changelogs/fragments/42669-add_ssl_zabbix_inventory.yaml

@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - Added capability to skip ssl verification 
+    on zabbix host with dynamic inventory

changelogs/fragments/42857-docker_container-working_dir.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_container: fixing ``working_dir`` idempotency problem (https://github.com/ansible/ansible/pull/42857)"

changelogs/fragments/43024-nclu-empty-net-commands.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- nclu - no longer runs net on empty lines in templates (https://github.com/ansible/ansible/pull/43024)

changelogs/fragments/43931-strip-trailing-comments.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - user - Strip trailing comments in /etc/default/passwd (https://github.com/ansible/ansible/pull/43931)

changelogs/fragments/43997-docker_network-inspect.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_network - fixes idempotency issues (https://github.com/ansible/ansible/issues/33045) and name substring issue (https://github.com/ansible/ansible/issues/32926)."

changelogs/fragments/44324-ini_file-options-with-no-section-managed.yaml

@@ -0,0 +1,4 @@
+---
+bugfixes:
+- "ini_file: Options within no sections aren't included, deleted or modified. These are just unmanged. This pull request solves this.
+   (see https://github.com/ansible/ansible/pull/44324)"

changelogs/fragments/44412-copy-fix-unwanted-acls.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Fix unwanted ACLs when using copy module (https://github.com/ansible/ansible/issues/44412)

changelogs/fragments/44500-win_domain_computer.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- win_domain_computer - fixed deletion of computer active directory object that have dependent objects (https://github.com/ansible/ansible/pull/44500)

changelogs/fragments/44508-win_lineinfile.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- win_lineinfile - changed `-Path` to `-LiteralPath` so that square brackes in the path are interpreted literally -  https://github.com/ansible/ansible/issues/44508

changelogs/fragments/44552-mail-py370-compat.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- fix mail module for python 3.7.0 (https://github.com/ansible/ansible/pull/44552)

changelogs/fragments/44561-vmware_host_config_manager-fix_key_error.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- Fixed KeyError issue in vmware_host_config_manager when a supported option isn't already set (https://github.com/ansible/ansible/issues/44561).

changelogs/fragments/44755-win_nssm_fixes.yaml

@@ -0,0 +1,10 @@
+bugfixes:
+- win_nssm - Fix several issues and idempotency problems (https://github.com/ansible/ansible/pull/44755)
+- win_nssm - Fix service not started when ``state=started`` (https://github.com/ansible/ansible/issues/35442)
+- win_nssm - Correctly escape argument line when a parameter contains spaces, quotes or backslashes
+- win_nssm - Add missing space between parameters with ``app_parameters``
+- win_nssm - Fix extra space added in argument line with ``app_parameters`` or ``app_parameters_free_form`` when a parameter start by a dash and is followed by a period (https://github.com/ansible/ansible/issues/44079)
+- win_nssm - Fix error when several services were given to the ``dependencies`` option
+
+minor_changes:
+- win_nssm - Drop support of literal YAML dictionnary for ``app_parameters`` option. Use the ``key=value;`` string form instead

changelogs/fragments/44808-docker_container-idempotency.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "improves docker_container idempotency (https://github.com/ansible/ansible/pull/44808)"

changelogs/fragments/44988-acme-post-as-get.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "ACME modules support `POST-as-GET <https://community.letsencrypt.org/t/acme-v2-scheduled-deprecation-of-unauthenticated-resource-gets/74380>`__ and will be able to access Let's Encrypt ACME v2 endpoint after November 1st, 2019."

changelogs/fragments/45122-fix-unarchive-excluded_files.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Fixed: Make sure that the files excluded when extracting the archive are not checked. https://github.com/ansible/ansible/pull/45122"

changelogs/fragments/45151-fix-os-exception.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- replace renamed exceptions in multiple openstack modules

changelogs/fragments/45155-vmware-handle_exception.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- vmware_host_service_facts - handle exception when service package does not have package name.

changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Update docs and return section of vmware_host_service_facts module.

changelogs/fragments/45226-vmware_wait_for_ip_address.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- vmware - honor "wait_for_ip_address" when powering on a VM

changelogs/fragments/45269-fix-vm-crashing.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- azure_rm_virtualmachine - fixed several crashes in module

changelogs/fragments/45378-fix-sql-tags.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- azure_rm_sqlserver - fix for tags support

changelogs/fragments/45417-ldap_entry-list_conversion.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- Fix iterator to list conversion in ldap_entry module.

changelogs/fragments/45501-get_url-better_checksums.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- get_url - support remote checksum files with paths specified with leading dots (`./path/to/file`)

changelogs/fragments/45508-parse-docker-service-parameter.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - docker_service - correctly parse string values for the `scale` parameter https://github.com/ansible/ansible/pull/45508

changelogs/fragments/45543-rabbitmq_bindings-fix-quote.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- Fix the quoting of vhost and other names in rabbitmq_binding

changelogs/fragments/45628-fetch_url-error-headers.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "fetch_url did not always return lower-case header names in case of HTTP errors (https://github.com/ansible/ansible/pull/45628)."

changelogs/fragments/45700-docker_container-dont-parse-absent.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Don't parse parameters and options when ``state`` is ``absent`` (https://github.com/ansible/ansible/pull/45700)."

changelogs/fragments/45704-fix-redfish_facts-http-redirect.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Fix issue with HTTP redirects with redfish_facts module (https://github.com/ansible/ansible/pull/45704)"

changelogs/fragments/45712-45753-vultr-timeout.yml

@@ -0,0 +1,3 @@
+bugfixes:
+- Vultr - fix for unreliable API behaviors resulting in timeouts (https://github.com/ansible/ansible/pull/45712/).
+- vultr_server - fix diff for user data (https://github.com/ansible/ansible/pull/45753/).

changelogs/fragments/45830-fixed-assigning-ssl-certificate.yaml

@@ -0,0 +1,4 @@
+bugfixes:
+- "Fixed: Appropriate code to expand value was missing so assigning SSL
+   certificate is not working as described in the documentation.
+   https://github.com/ansible/ansible/pull/45830"

changelogs/fragments/45921-os_router-ignores-enable_snat-no.yml

@@ -0,0 +1,2 @@
+bugfixes:
+    - "os_router - ``enable_snat: no`` was ignored."

changelogs/fragments/46044-puppet-puppet6-fix.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Puppet module remove ``--ignorecache`` to allow Puppet 6 support

changelogs/fragments/46049-route53-caa-ordering.txt

@@ -0,0 +1,2 @@
+bugfixes:
+- "route53 - fix CAA record ordering for idempotency."

changelogs/fragments/46115-46035-cs_instance-fixes.yml

@@ -0,0 +1,3 @@
+bugfixes:
+- cs_instance - Fix host migration without volume (https://github.com/ansible/ansible/pull/46115).
+- cs_instance - Fix docs and typo in examples (https://github.com/ansible/ansible/pull/46035).

changelogs/fragments/46148-provide-redfish_facts-gathering-flexibility.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Provides flexibility when retrieving redfish facts by not assuming that certains keys exist. Checks first if key exists before attempting to read from it."

changelogs/fragments/46245-systemd-fix-service-enable-logic.yaml

@@ -0,0 +1,3 @@
+bugfixes:
+- In systemd module, allow scope to default to 'system'
+- In systemd module, fix check if a systemd+initd service is enabled - disabled in systemd means disabled

changelogs/fragments/46322-docker_container-image-not-given.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_container - the behavior is improved in case ``image`` is not specified, but needed for (re-)creating the container."

changelogs/fragments/46478-haproxy-fix-drain-mode.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- Backport of https://github.com/ansible/ansible/pull/46478 , fixes name collision in haproxy module

changelogs/fragments/46521-zabbix_host-fix-link-template-error.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "zabbix_host - module was failing when zabbix host was updated with new interface and template depending on that interface at the same time"

changelogs/fragments/46594-docker_container-publish-all-ports.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_container - ``publish_ports: all`` was not used correctly when checking idempotency."

changelogs/fragments/46595-docker_container-expected_ports.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_container - fix idempotency check for published_ports in some special cases."

changelogs/fragments/46604-ontap-cifs-server-no-log-password.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fixes issue where a password parameter was not set to no_log

changelogs/fragments/46658-plugin_filter-improve_error_handling.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Parsing plugin filter may raise TypeError, gracefully handle this exception and let user know about the syntax error in plugin filter file.

changelogs/fragments/46665-plugin_filter_doc_fix.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Update plugin filter documentation.

changelogs/fragments/46700-vmware_doc-standalone_esxi.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Fix documentation for cloning template.