Adding upstream version 2.10.7+merged+base+2.10.8+dfsg.upstream/2.10.7+merged+base+2.10.8+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 675 insertions, 0 deletions

diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_2_10.rst b/docs/docsite/rst/roadmap/COLLECTIONS_2_10.rst
new file mode 100644
index 00000000..88d6fdcd
--- /dev/null
+++ b/docs/docsite/rst/roadmap/COLLECTIONS_2_10.rst
@@ -0,0 +1,51 @@
+====================
+Ansible project 2.10
+====================
+
+This release schedule includes dates for the `ansible <https://pypi.org/project/ansible/>`_ package, with a few dates for the `ansible-base <https://pypi.org/project/ansible-base/>`_ package as well. All dates are subject to change. See :ref:`base_roadmap_2_10` for the most recent updates on ansible-base.
+
+.. contents::
+   :local:
+
+Release Schedule
+----------------
+
+.. note:: Dates subject to change.
+.. note:: We plan to post weekly alpha releases to the `PyPI ansible project <https://pypi.org/project/ansible/>`_ for testing.
+
+.. warning::
+    We initially were going to have feature freeze on 2020-08-18. We tried this but decided to
+    change course.  Instead, we'll enter feature freeze when ansible-2.10.0 beta1 is released.
+
+- 2020-06-23: ansible-2.10 alpha freeze.
+  No net new collections will be added to the ``ansible-2.10`` package after this date.
+- 2020-07-10: Ansible collections freeze date for content shuffling.
+  Content should be in its final collection for the ansible-2.10 series of releases. No more content should move out of the ``community.general`` or ``community.network`` collections.
+- 2020-08-13: ansible-base 2.10 Release date, see :ref:`base_roadmap_2_10`.
+- 2020-08-14: final ansible-2.10 alpha.
+- 2020-09-01: ansible-2.10.0 beta1 and feature freeze.
+
+  - No new modules or major features will be added after this date. In practice this means we will freeze the semver collection versions to compatible release versions. For example, if the version of community.crypto on this date was community-crypto-1.1.0; ansible-2.10.0 could ship with community-crypto-1.1.1.  It would not ship with community-crypto-1.2.0.
+
+- 2020-09-08: ansible-2.10.0 beta2.
+- 2020-09-15: ansible-2.10.0 rc1 and final freeze.
+
+  - After this date only changes blocking a release are accepted.
+  - Collections will only be updated to a new version if a blocker is approved.  Collection owners should discuss any blockers at the community IRC meeting (on 9-17) to decide whether to bump the version of the collection for a fix. See the `Community IRC meeting agenda <https://github.com/ansible/community/issues/539>`_.
+
+** Additional release candidates to be published as needed as blockers are fixed **
+
+- 2020-09-22: ansible-2.10 GA release date.
+
+Ansible-2.10.x patch releases will occur roughly every three weeks if changes to collections have been made or if it is deemed necessary to force an upgrade to a later ansible-base-2.10.x.  Ansible-2.10.x patch releases may contain new features but not backwards incompatibilities.  In practice, this means we will include new collection versions where either the patch or the minor version number has changed but not when the major number has changed (example: Ansible-2.10 ships with community-crypto-1.1.0; ansible-2.10.1 may ship with community-crypto-1.2.0 but would not ship with community-crypto-2.0.0).
+
+
+.. note::
+
+    Minor releases will stop when :ref:`Ansible-3 <ansible_3_roadmap>` is released.  See the :ref:`Release and Maintenance Page <release_and_maintenance>` for more information.
+
+
+Breaking changes may be introduced in ansible-3.0 although we encourage collection owners to use deprecation periods that will show up in at least one Ansible release before being changed incompatibly.
+
+
+For more information, reach out on a mailing list or an IRC channel - see :ref:`communication` for more details.
diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_3_0.rst b/docs/docsite/rst/roadmap/COLLECTIONS_3_0.rst
new file mode 100644
index 00000000..2af350ab
--- /dev/null
+++ b/docs/docsite/rst/roadmap/COLLECTIONS_3_0.rst
@@ -0,0 +1,58 @@
+.. _ansible_3_roadmap:
+
+===================
+Ansible project 3.0
+===================
+
+This release schedule includes dates for the `ansible <https://pypi.org/project/ansible/>`_ package, with a few dates for the `ansible-base <https://pypi.org/project/ansible-base/>`_ package as well. All dates are subject to change. Ansible 3.x.x includes ``ansible-base`` 2.10. See :ref:`base_roadmap_2_10` for the most recent updates on ``ansible-base``.
+
+.. contents::
+   :local:
+
+Release schedule
+=================
+
+.. note::
+
+    Ansible is switching from its traditional versioning scheme to `semantic versioning <https://semver.org/>`_ starting with this release.  So this version is 3.0.0 instead of 2.11.0.
+
+
+
+:2020-12-16: Finalize rules for net-new collections submitted for the ansible release.
+:2021-01-27: Final day for new collections to be **reviewed and approved**. They MUST be
+    submitted prior to this to give reviewers a chance to look them over and for collection owners
+    to fix any problems.
+:2021-02-02: Ansible-3.0.0-beta1 -- feature freeze [1]_
+:2021-02-09: Ansible-3.0.0-rc1 -- final freeze [2]_ [3]_
+:2021-02-16: Release of Ansible-3.0.0
+:2021-03-09: Release of Ansible-3.1.0 (bugfix + compatible features: every three weeks)
+
+.. [1] No new modules or major features accepted after this date. In practice this means we will freeze the semver collection versions to compatible release versions. For example, if the version of community.crypto on this date was community-crypto-2.1.0; ansible-3.0.0 could ship with community-crypto-2.1.1.  It would not ship with community-crypto-2.2.0.
+
+.. [2] After this date only changes blocking a release are accepted.  Accepted changes require creating a new rc and may slip the final release date.
+.. [3] Collections will only be updated to a new version if a blocker is approved.  Collection owners should discuss any blockers at a community IRC meeting (before this freeze) to decide whether to bump the version of the collection for a fix. See the `Community IRC meeting agenda <https://github.com/ansible/community/issues/539>`_.
+
+
+.. note::
+
+  Breaking changes may be introduced in Ansible 3.0.0, although we encourage collection owners to use deprecation periods that will show up in at least one Ansible release before the breaking change happens.
+
+
+Ansible minor releases
+=======================
+
+Ansible 3.x.x minor releases will occur approximately every three weeks if changes to collections have been made or if it is deemed necessary to force an upgrade to a later ansible-base-2.10.x.  Ansible 3.x.x minor releases may contain new features but not backwards incompatibilities.  In practice, this means we will include new collection versions where either the patch or the minor version number has changed but not when the major number has changed. For example, if Ansible-3.0.0 ships with community-crypto-2.1.0; Ansible-3.1.0 may ship with community-crypto-2.2.0 but would not ship with community-crypto-3.0.0).
+
+
+.. note::
+
+    Minor releases will stop when :ref:`Ansible-4 <ansible_4_roadmap>` is released.  See the :ref:`Release and Maintenance Page <release_and_maintenance>` for more information.
+
+
+For more information, reach out on a mailing list or an IRC channel - see :ref:`communication` for more details.
+
+
+ansible-base release
+====================
+
+Ansible 3.x.x works with ``ansible-base`` 2.10. See :ref:`base_roadmap_2_10` for details.
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_10.rst b/docs/docsite/rst/roadmap/ROADMAP_2_10.rst
new file mode 100644
index 00000000..d303ca46
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_10.rst
@@ -0,0 +1,51 @@
+.. _base_roadmap_2_10:
+
+=================
+Ansible-base 2.10
+=================
+
+.. contents::
+   :local:
+
+Release Schedule
+----------------
+
+Expected
+========
+
+PRs must be raised well in advance of the dates below to have a chance of being included in this ansible-base release.
+
+.. note:: There is no Alpha phase in 2.10.
+.. note:: Dates subject to change.
+
+- 2020-06-16 Beta 1 **Feature freeze**
+  No new functionality (including modules/plugins) to any code
+
+- 2020-07-21 Release Candidate 1 (bumped from 2020-07-14)
+- 2020-07-24 Release Candidate 2
+- 2020-07-25 Release Candidate 3
+- 2020-07-30 Release Candidate 4
+- 2020-08-13 Release
+
+Release Manager
+---------------
+
+@sivel
+
+Planned work
+============
+
+- Migrate non-base plugins and modules from the ``ansible/ansible`` repository to smaller collection repositories
+- Add functionality to ease transition to collections, such as automatic redirects from the 2.9 names to the new FQCN of the plugin
+- Create new ``ansible-base`` package representing the ``ansible/ansible`` repository
+
+Additional Resources
+====================
+
+The 2.10 release of Ansible will fundamentally change the scope of plugins included in the ``ansible/ansible`` repository, by
+moving much of the plugins into smaller collection repositories that will be shipped through https://galaxy.ansible.com/
+
+The following links have more information about this process:
+
+- https://groups.google.com/d/msg/ansible-devel/oKqgCeYTs-M/cHrOgMw8CAAJ
+- https://github.com/ansible-collections/overview/blob/main/README.rst
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_5.rst b/docs/docsite/rst/roadmap/ROADMAP_2_5.rst
new file mode 100644
index 00000000..34d376ce
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_5.rst
@@ -0,0 +1,142 @@
+===========
+Ansible 2.5
+===========
+**Core Engine Freeze and Module Freeze: 22 January 2018**
+
+**Core and Curated Module Freeze: 22 January 2018**
+
+**Community Module Freeze: 7 February 2018**
+
+**Release Candidate 1 will be 21 February, 2018**
+
+**Target: March 2018**
+
+**Service Release schedule: every 2-3 weeks**
+
+.. contents:: Topics
+
+Release Manager
+---------------
+Matt Davis (IRC/GitHub: @nitzmahone)
+
+
+Engine improvements
+-------------------
+- Assemble module improvements
+  - assemble just skips when in check mode, it should be able to test if there is a difference and changed=true/false.
+  - The same with diff, it should work as template modules does
+- Handle Password reset prompts cleaner
+- Tasks stats for rescues and ignores
+- Normalize temp dir usage across all subsystems
+- Add option to set playbook dir for adhoc, inventory and console to allow for 'relative path loading'
+
+
+Ansible-Config
+--------------
+- Extend config to more plugin types and update plugins to support the new config
+
+Inventory
+---------
+- ansible-inventory option to output group variable assignment and data (--export)
+- Create inventory plugins for:
+  - aws
+
+Facts
+-----
+- Namespacing fact variables (via a config option) implemented in ansible/ansible PR `#18445 <https://github.com/ansible/ansible/pull/18445>`_.
+  Proposal found in ansible/proposals issue `#17 <https://github.com/ansible/proposals/issues/17>`_.
+- Make fact collectors and gather_subset specs finer grained
+- Eliminate unneeded deps between fact collectors
+- Allow fact collectors to indicate if they need information from another fact collector to be gathered first.
+
+Static Loop Keyword
+-------------------
+
+- A simpler altenative to ``with_``, ``loop:`` only takes a list
+- Remove complexity from loops, lookups are still available to users
+- Less confusing having a static directive vs a one that is dynamic depending on plugins loaded.
+
+Vault
+-----
+- Vault secrets client inc new 'keyring' client
+
+Runtime Check on Modules for Blacklisting
+-----------------------------------------
+- Filter on things like "supported_by" in module metadata
+- Provide users with an option of "warning, error or allow/ignore"
+- Configurable via ansible.cfg and environment variable
+
+Windows
+-------
+- Implement gather_subset on Windows facts
+- Fix Windows async + become to allow them to work together
+- Implement Windows become flags for controlling various modes **(done)**
+  - logontype
+  - elevation behavior
+- Convert win_updates to action plugin for auto reboot and extra features **(done)**
+- Spike out changing the connection over to PSRP instead of WSMV **(done- it's possible)**
+- Module updates
+
+  - win_updates **(done)**
+
+    - Fix win_updates to detect (or request) become
+    - Add whitelist/blacklist features to win_updates
+  - win_dsc further improvements **(done)**
+
+General Cloud
+-------------
+- Make multi-cloud provisioning easier
+- Diff mode will output provisioning task results of ansible-playbook runs
+- Terraform module
+
+AWS
+---
+- Focus on pull requests for various modules
+- Triage existing merges for modules
+- Module work
+
+  - ec2_instance
+  - ec2_vpc: Allow the addition of secondary IPv4 CIDRS to existing VPCs.
+  - AWS Network Load Balancer support (NLB module, ASG support, and so on)
+  - rds_instance
+
+Azure
+-----
+- Azure CLI auth **(done)**
+- Fix Azure module results to have "high-level" output instead of raw REST API dictionary **(partial, more to come in 2.6)**
+- Deprecate Azure automatic storage accounts in azure_rm_virtualmachine **(breaks on Azure Stack, punted until AS supports managed disks)**
+
+Network Roadmap
+---------------
+- Refactor common network shared code into package **(done)**
+- Convert various nxos modules to leverage declarative intent **(done)**
+- Refactor various modules to leverage the cliconf plugin **(done)**
+- Add various missing declarative modules for supported platforms and functions **(done)**
+- Implement a feature that handles platform differences and feature unavailability **(done)**
+- netconf-config.py should provide control for deployment strategy
+- Create netconf connection plugin **(done)**
+- Create netconf fact module
+- Turn network_cli into a usable connection type **(done)**
+- Implements jsonrpc message passing for ansible-connection **(done)**
+- Improve logging for ansible-connection **(done)**
+- Improve stdout output for failures whilst using persistent connection **(done)**
+- Create IOS-XR NetConf Plugin and refactor iosxr modules to leverage netconf plugin **(done)**
+- Refactor junos modules to use netconf plugin **(done)**
+- Filters: Add a filter to convert XML response from a network device to JSON object **(done)**
+
+Documentation
+-------------
+- Extend documentation to more plugins
+- Document vault-password-client scripts.
+- Network Documentation
+
+  - New landing page (to replace intro_networking) **(done)**
+  - Platform specific guides **(done)**
+  - Walk through: Getting Started **(done)**
+  - Networking and ``become`` **(done)**
+  - Best practice **(done)**
+
+Contributor Quality of Life
+---------------------------
+- Finish PSScriptAnalyer integration with ansible-test (for enforcing Powershell style) **(done)**
+- Resolve issues requiring skipping of some integration tests on Python 3.
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_6.rst b/docs/docsite/rst/roadmap/ROADMAP_2_6.rst
new file mode 100644
index 00000000..49a6ebab
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_6.rst
@@ -0,0 +1,82 @@
+===========
+Ansible 2.6
+===========
+
+.. contents:: Topics
+
+Release Schedule
+----------------
+
+Actual
+======
+
+- 2018-05-17 Core Freeze (Engine and Core Modules/Plugins)
+- 2018-05-21 Alpha Release 1
+- 2018-05-25 Community Freeze (Non-Core Modules/Plugins)
+- 2018-05-25 Branch stable-2.6
+- 2018-05-30 Alpha Release 2
+- 2018-06-05 Release Candidate 1
+- 2018-06-08 Release Candidate 2
+- 2018-06-18 Release Candidate 3
+- 2018-06-25 Release Candidate 4
+- 2018-06-26 Release Candidate 5
+- 2018-06-28 Final Release
+
+
+Release Manager
+---------------
+* 2.6.0-2.6.12 Matt Clay (IRC/GitHub: @mattclay)
+* 2.6.13+ Toshio Kuratomi (IRC: abadger1999; GitHub: @abadger)
+
+
+Engine improvements
+-------------------
+
+- Version 2.6 is largely going to be a stabilization release for Core code.
+- Some of the items covered in this release, but are not limited to are the following:
+
+  - ``ansible-inventory``
+  - ``import_*``
+  - ``include_*``
+  - Test coverage
+  - Performance Testing
+
+Core Modules
+------------
+- Adopt-a-module Campaign
+
+  - Review current status of all Core Modules
+  - Reduce backlog of open issues against these modules
+
+Cloud Modules
+-------------
+
+Network
+-------
+
+Connection work
+================
+
+* New connection plugin: eAPI `proposal#102 <https://github.com/ansible/proposals/issues/102>`_
+* New connection plugin: NX-API
+* Support for configurable options for network_cli & netconf
+
+Modules
+=======
+
+* New ``net_get`` - platform agnostic module for pulling configuration via SCP/SFTP over network_cli
+* New ``net_put`` - platform agnostic module for pushing configuration via SCP/SFTP over network_cli
+* New ``netconf_get`` - Netconf module to fetch configuration and state data `proposal#104 <https://github.com/ansible/proposals/issues/104>`_
+
+Other Features
+================
+
+* Stretch & tech preview: Configuration caching for network_cli. Opt-in feature to avoid ``show running`` performance hit
+
+
+Windows
+-------
+
+
+
+
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_7.rst b/docs/docsite/rst/roadmap/ROADMAP_2_7.rst
new file mode 100644
index 00000000..bf65dcf7
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_7.rst
@@ -0,0 +1,109 @@
+===========
+Ansible 2.7
+===========
+
+.. contents:: Topics
+
+Release Schedule
+----------------
+
+Expected
+========
+
+- 2018-08-23 Core Freeze (Engine and Core Modules/Plugins)
+- 2018-08-23 Alpha Release 1
+- 2018-08-30 Community Freeze (Non-Core Modules/Plugins)
+- 2018-08-30 Beta Release 1
+- 2018-09-06 Release Candidate 1 (If needed)
+- 2018-09-13 Release Candidate 2 (If needed)
+- 2018-09-20 Release Candidate 3 (If needed)
+- 2018-09-27 Release Candidate 4 (If needed)
+- 2018-10-04 General Availability
+
+Release Manager
+---------------
+Toshio Kuratomi (IRC: abadger1999; GitHub: @abadger)
+
+
+Cleaning Duty
+-------------
+
+- Drop Py2.6 for controllers  `Docs PR #42971 <https://github.com/ansible/ansible/pull/42971>`_ and
+  `issue #42972 <https://github.com/ansible/ansible/issues/42972>`_
+- Remove dependency on simplejson `issue #42761 <https://github.com/ansible/ansible/issues/42761>`_
+
+
+Engine Improvements
+-------------------
+
+- Performance improvement invoking Python modules `pr #41749 <https://github.com/ansible/ansible/pull/41749>`_
+- Jinja native types will allow for users to render a Python native type. `pr #32738 <https://github.com/ansible/ansible/pull/32738>`_
+
+
+Core Modules
+------------
+
+- Include feature changes and improvements
+
+  - Create new argument ``apply`` that will allow for included tasks to inherit explicitly provided attributes. `pr #39236 <https://github.com/ansible/ansible/pull/39236>`_
+  - Create "private" functionality for allowing vars/default to be exposed outside of roles. `pr #41330 <https://github.com/ansible/ansible/pull/41330>`_
+- Provide a parameter for the ``template`` module to output to different encoding formats `pr
+  #42171 <https://github.com/ansible/ansible/pull/42171>`_
+- ``reboot`` module for Linux hosts (@samdoran) `pr #35205 <https://github.com/ansible/ansible/pull/35205>`_
+
+Cloud Modules
+-------------
+
+General
+=======
+* Cloud auth plugin `proposal #24 <https://github.com/ansible/proposals/issues/24>`_
+
+AWS
+===
+* Inventory plugin for RDS `pr #41919 <https://github.com/ansible/ansible/pull/41919>`_
+* Count support for `ec2_instance`
+* `aws_eks` module `pr #41183 <https://github.com/ansible/ansible/pull/41183>`_
+* Cloudformation stack sets support (`PR#41669 <https://github.com/ansible/ansible/pull/41669>`_)
+* RDS instance and snapshot modules `pr #39994 <https://github.com/ansible/ansible/pull/39994>`_ `pr #43789 <https://github.com/ansible/ansible/pull/43789>`_
+* Diff mode improvements for cloud modules `pr #44533 <https://github.com/ansible/ansible/pull/44533>`_
+
+Azure
+=====
+
+* Azure inventory plugin `issue #42769 <https://github.com/ansible/ansible/issues/42769>`__
+
+
+Network
+-------
+
+General
+=======
+
+* Refactor the APIs in cliconf (`issue #39056 <https://github.com/ansible/ansible/issues/39056>`_) and netconf (`issue #39160 <https://github.com/ansible/ansible/issues/39160>`_) plugins so that they have a uniform signature across supported network platforms. **done**
+  (`PR #41846 <https://github.com/ansible/ansible/pull/41846>`_) (`PR #43643 <https://github.com/ansible/ansible/pull/43643>`_) (`PR #43837 <https://github.com/ansible/ansible/pull/43837>`_)
+  (`PR #43203 <https://github.com/ansible/ansible/pull/43203>`_) (`PR #42300 <https://github.com/ansible/ansible/pull/42300>`_) (`PR #44157 <https://github.com/ansible/ansible/pull/44157>`_)
+
+Modules
+=======
+
+* New ``cli_config`` module `issue #39228 <https://github.com/ansible/ansible/issues/39228>`_ **done** `PR #42413 <https://github.com/ansible/ansible/pull/42413>`_.
+* New ``cli_command`` module `issue #39284 <https://github.com/ansible/ansible/issues/39284>`_
+* Refactor ``netconf_config`` module to add additional functionality. **done** `proposal #104 <https://github.com/ansible/proposals/issues/104>`_ (`PR #44379 <https://github.com/ansible/ansible/pull/44379>`_)
+
+Windows
+-------
+
+General
+=======
+
+* Added new connection plugin that uses PSRP as the connection protocol `pr #41729 <https://github.com/ansible/ansible/pull/41729>`__
+
+Modules
+=======
+
+* Revamp Chocolatey to fix bugs and support offline installation `pr #43013 <https://github.com/ansible/ansible/pull/43013>`_.
+* Add Chocolatey modules that can manage the following Chocolatey features
+
+    * `Sources <https://chocolatey.org/docs/commands-sources>`_ `pr #42790 <https://github.com/ansible/ansible/pull/42790>`_
+    * `Features <https://chocolatey.org/docs/chocolatey-configuration#features>`_ `pr #42848 <https://github.com/ansible/ansible/pull/42848>`_
+    * `Config <https://chocolatey.org/docs/chocolatey-configuration#config-settings>`_ `pr #42915 <h*ttps://github.com/ansible/ansible/pull/42915>`_
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_8.rst b/docs/docsite/rst/roadmap/ROADMAP_2_8.rst
new file mode 100644
index 00000000..04977aa7
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_8.rst
@@ -0,0 +1,38 @@
+===========
+Ansible 2.8
+===========
+
+.. contents::
+   :local:
+
+Release Schedule
+----------------
+
+Expected
+========
+
+PRs must be raised well in advance of the dates below to have a chance of being included in this Ansible release.
+
+- 2019-04-04 Alpha 1 **Core freeze**
+  No new features to ``support:core`` code.
+  Includes no new options to existing Core modules
+
+- 2019-04-11 Beta 1 **Feature freeze**
+  No new functionality (including modules/plugins) to any code
+
+- 2019-04-25 Release Candidate 1
+- 2019-05-02 Release Candidate 2
+- 2019-05-10 Release Candidate 3
+- 2019-05-16 Release
+
+
+
+Release Manager
+---------------
+
+Toshio Kuratomi (IRC: abadger1999; GitHub: @abadger)
+
+Planned work
+============
+
+See the `Ansible 2.8 Project Board <https://github.com/ansible/ansible/projects/30>`_
diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_9.rst b/docs/docsite/rst/roadmap/ROADMAP_2_9.rst
new file mode 100644
index 00000000..370930ac
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ROADMAP_2_9.rst
@@ -0,0 +1,39 @@
+===========
+Ansible 2.9
+===========
+
+.. contents::
+   :local:
+
+Release Schedule
+----------------
+
+Expected
+========
+
+PRs must be raised well in advance of the dates below to have a chance of being included in this Ansible release.
+
+.. note:: There is no Alpha phase in 2.9.
+
+- 2019-08-29 Beta 1 **Feature freeze**
+  No new functionality (including modules/plugins) to any code
+
+- 2019-09-19 Release Candidate 1
+- 2019-10-03 Release Candidate 2
+- 2019-10-10 Release Candidate 3
+- 2019-10-17 Release Candidate 4 (if needed)
+- 2019-10-24 Release Candidate 5 (if needed)
+- 2019-10-31 Release
+
+
+
+Release Manager
+---------------
+TBD
+
+Temporarily, Matt Davis (@nitzmahone) or Matt Clay (@mattclay) on IRC or github.
+
+Planned work
+============
+
+See the `Ansible 2.9 Project Board <https://github.com/ansible/ansible/projects/34>`_
diff --git a/docs/docsite/rst/roadmap/ansible_base_roadmap_index.rst b/docs/docsite/rst/roadmap/ansible_base_roadmap_index.rst
new file mode 100644
index 00000000..8bc68547
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ansible_base_roadmap_index.rst
@@ -0,0 +1,31 @@
+.. _ansible_core_roadmaps:
+
+ansible-core Roadmaps
+=====================
+
+The ``ansible-core`` team develops a roadmap for each major and minor ``ansible-core`` release. The latest roadmap shows current work; older roadmaps provide a history of the project. We don't publish roadmaps for subminor versions. So 2.10 and 2.11 have roadmaps, but 2.10.1 does not.
+
+.. note::
+
+	Ansible renamed ``ansible-base`` to ``ansible-core``.
+
+We incorporate team and community feedback in each roadmap, and aim for further transparency and better inclusion of both community desires and submissions.
+
+Each roadmap offers a *best guess*, based on the ``ansible-core`` team's experience and on requests and feedback from the community, of what will be included in a given release. However, some items on the roadmap may be dropped due to time constraints, lack of community maintainers, and so on.
+
+Each roadmap is published both as an idea of what is upcoming in ``ansible-core``, and as a medium for seeking further feedback from the community.
+
+You can submit feedback on the current roadmap in multiple ways:
+
+- Edit the agenda of an IRC `Core Team Meeting <https://github.com/ansible/community/blob/master/meetings/README.md>`_ (preferred)
+- Post on the ``#ansible-devel`` Freenode IRC channel
+- Email the ansible-devel list
+
+See :ref:`Ansible communication channels <communication>` for details on how to join and use the email lists and IRC channels.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   :caption: ansible-core Roadmaps
+
+   ROADMAP_2_10
diff --git a/docs/docsite/rst/roadmap/ansible_roadmap_index.rst b/docs/docsite/rst/roadmap/ansible_roadmap_index.rst
new file mode 100644
index 00000000..d350023b
--- /dev/null
+++ b/docs/docsite/rst/roadmap/ansible_roadmap_index.rst
@@ -0,0 +1,26 @@
+.. _ansible_roadmaps:
+
+Ansible Roadmap
+===============
+
+The Ansible team develops a roadmap for each major and minor Ansible release. The latest roadmap shows current work; older roadmaps provide a history of the project. We don't publish roadmaps for subminor versions. So 2.10 and 2.11 have roadmaps, but 2.10.1 does not.
+
+We incorporate team and community feedback in each roadmap, and aim for further transparency and better inclusion of both community desires and submissions.
+
+Each roadmap offers a *best guess*, based on the Ansible team's experience and on requests and feedback from the community, of what will be included in a given release. However, some items on the roadmap may be dropped due to time constraints, lack of community maintainers, and so on.
+
+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.
+
+You can submit feedback on the current roadmap in multiple ways:
+
+- Edit the agenda of an IRC `Ansible Community Meeting <https://github.com/ansible/community/issues/539>`_ (preferred)
+- Post on the ``#ansible-community`` Freenode IRC channel
+
+See :ref:`Ansible communication channels <communication>` for details on how to join and use the IRC channels.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   :caption: Ansible Release Roadmaps
+
+   COLLECTIONS_2_10
diff --git a/docs/docsite/rst/roadmap/index.rst b/docs/docsite/rst/roadmap/index.rst
new file mode 100644
index 00000000..d1e248b0
--- /dev/null
+++ b/docs/docsite/rst/roadmap/index.rst
@@ -0,0 +1,29 @@
+.. _roadmaps:
+
+Ansible Roadmap
+===============
+
+The Ansible team develops a roadmap for each major and minor Ansible release. The latest roadmap shows current work; older roadmaps provide a history of the project. We don't publish roadmaps for subminor versions. So 2.0 and 2.8 have roadmaps, but 2.7.1 does not.
+
+We incorporate team and community feedback in each roadmap, and aim for further transparency and better inclusion of both community desires and submissions.
+
+Each roadmap offers a *best guess*, based on the Ansible team's experience and on requests and feedback from the community, of what will be included in a given release. However, some items on the roadmap may be dropped due to time constraints, lack of community maintainers, etc.
+
+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.
+
+You can submit feedback on the current roadmap in multiple ways:
+
+- Edit the agenda of an IRC `Core Team Meeting <https://github.com/ansible/community/blob/master/meetings/README.md>`_ (preferred)
+- Post on the ``#ansible-devel`` Freenode IRC channel
+- Email the ansible-devel list
+
+See :ref:`Ansible communication channels <communication>` for details on how to join and use the email lists and IRC channels.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   :caption: Ansible Roadmaps
+
+   ansible_base_roadmap_index
+   ansible_roadmap_index
+   old_roadmap_index
diff --git a/docs/docsite/rst/roadmap/old_roadmap_index.rst b/docs/docsite/rst/roadmap/old_roadmap_index.rst
new file mode 100644
index 00000000..78769f17
--- /dev/null
+++ b/docs/docsite/rst/roadmap/old_roadmap_index.rst
@@ -0,0 +1,19 @@
+.. _old_roadmaps:
+
+Older Roadmaps
+===============
+
+Older roadmaps are listed here to provide a history of the Ansible project.
+
+See :ref:`roadmaps` to find current Ansible and ``ansible-base`` roadmaps.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   :caption: Older Roadmaps
+
+   ROADMAP_2_9
+   ROADMAP_2_8
+   ROADMAP_2_7
+   ROADMAP_2_6
+   ROADMAP_2_5