Merge branch 'devel' of https://github.com/ansible/ansible into devel

.github/BOTMETA.yml

@@ -134,7 +134,9 @@ files:
   $modules/cloud/vmware/_vsphere_guest.py: dagwieers
   $modules/cloud/vultr/: $team_vultr
   $modules/cloud/webfaction/: quentinsf
-  $modules/clustering/k8s/: chouseknecht maxamillion fabianvf flaper87 willthames
+  $modules/clustering/k8s/:
+    maintainers: chouseknecht maxamillion fabianvf flaper87 willthames
+    labels: k8s
   $modules/clustering/k8s/_kubernetes.py: supertom
   $modules/clustering/openshift/: chouseknecht maxamillion fabianvf flaper87
   $modules/commands/command.py: $team_ansible
@@ -307,7 +309,10 @@ files:
     ignored: erydo
   $modules/storage/infinidat/: GR360RY vmalloc
   $modules/storage/netapp/: $team_netapp
-  $modules/storage/purestorage/: sdodsley
+  $modules/storage/purestorage/:
+    maintainers: $team_purestorage
+    labels: pure_storage
+  $modules/storage/glusterfs/: devyanikota
   $modules/system/at.py: $team_ansible
   $modules/system/authorized_key.py: $team_ansible
   $modules/system/facter.py: $team_ansible
@@ -462,7 +467,9 @@ files:
     maintainers: $team_ipa
   $module_utils/k8s:
     maintainers: chouseknecht maxamillion fabianvf flaper87 willthames
-    labels: clustering
+    labels:
+      - clustering
+      - k8s
   $module_utils/keycloak.py:
     maintainers: eikef
   $module_utils/manageiq.py:
@@ -553,6 +560,8 @@ files:
     maintainers: $team_onyx
   $module_utils/network/ordnance:
     maintainers: alexanderturner djh00t
+  $module_utils/network/panos:
+    maintainers: ivanbojer jtschichold shinmog
   $module_utils/network/routeros:
     maintainers: heuels
   $module_utils/network/slxos:
@@ -580,6 +589,9 @@ files:
   $module_utils/remote_management/ucs:
     maintainers: $team_ucs
     labels: ucs
+  $module_utils/pure.py:
+    maintainers: $team_purestorage
+    labels: pure_storage
   $module_utils/netapp:
     maintainers: $team_netapp
   $module_utils/vultr.py: &vultr
@@ -856,14 +868,20 @@ files:
     support: core
   lib/ansible/plugins/inventory/ini.py:
     support: core
+  lib/ansible/plugins/inventory/k8s.py:
+    support: community
+    maintainers: chouseknecht maxamillion fabianvf flaper87 willthames
+    labels: k8s
+  lib/ansible/plugins/inventory/openshift.py:
+    support: community
+    maintainers: chouseknecht maxamillion fabianvf flaper87 willthames
   lib/ansible/plugins/inventory/openstack.py:
     maintainers: $team_openstack
     keywords:
       - openstack
       - inventory
     labels:
       - cloud
-  lib/ansible/plugins/inventory/netbox.py: sieben
   lib/ansible/plugins/inventory/scaleway.py: *scaleway
   lib/ansible/plugins/inventory/vultr.py: *vultr
   lib/ansible/plugins/inventory/yaml.py:
@@ -885,6 +903,10 @@ files:
     labels: community
   lib/ansible/plugins/lookup/cyberarkpassword.py:
     notified: cyberark-bizdev
+  lib/ansible/plugins/lookup/k8s.py:
+    support: community
+    maintainers: chouseknecht maxamillion fabianvf flaper87 willthames
+    labels: k8s
   lib/ansible/plugins/lookup/nios:
     support: core
     maintainers: $team_networking sganesh-infoblox
@@ -1073,10 +1095,11 @@ macros:
   team_onyx: samerd
   team_openstack: emonty omgjlk juliakreger rcarrillocruz shrews thingee dagnello
   team_openswitch: Qalthos gdpak
+  team_purestorage: sdodsley
   team_rabbitmq: chrishoffman manuel-sousa hyperized
   team_redfish: jose-delarosa mraineri tomasg2012 billdodd
   team_rhn: alikins barnabycourt flossware vritant
-  team_scaleway: sieben hekonsek Spredzy abarbare anthony25
+  team_scaleway: sieben hekonsek Spredzy abarbare anthony25 pilou-
   team_tower: ghjm jlaska matburt wwitzel3 simfarm ryanpetrello rooftopcellist AlanCoding
   team_ucs: dsoper2 johnamcdonough SDBrett vallard vvb dagwieers
   team_vmware: Akasurde dav1x warthog9

MANIFEST.in

@@ -6,6 +6,8 @@ include requirements.txt
 include .coveragerc
 include examples/hosts
 include examples/ansible.cfg
+recursive-include lib/ansible/executor/powershell *
+recursive-include lib/ansible/module_utils/csharp *
 recursive-include lib/ansible/module_utils/powershell *
 recursive-include lib/ansible/modules *
 recursive-include lib/ansible/galaxy/data *

changelogs/fragments/43123-add_support_for_per_host_no_stats.yaml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - Add support for per_host:no stats for the callback plugin **json** (https://github.com/ansible/ansible/pull/43123)

changelogs/fragments/43874-docker_container-stop_timeout.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- "docker_container - ``stop_timeout`` is now also used to set the ``StopTimeout`` property of the docker container when creating the container."

changelogs/fragments/44789-docker_container-comparisons.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- "The restart/idempotency behavior of docker_container can now be controlled with the new comparisons parameter."

changelogs/fragments/blockinfile-bytes-fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - blockinfile - use bytes rather than a native string to prevent a stacktrace in Python 3 when writing to the file (https://github.com/ansible/ansible/issues/46237)

changelogs/fragments/fix_ec2_group_vpc_precedence_classic.yaml

@@ -0,0 +1,7 @@
+---
+bugfixes:
+  - The patch fixing the regression of no longer preferring matching security
+    groups in the same VPC https://github.com/ansible/ansible/pull/45787
+    (which was also backported to 2.6) broke EC2-Classic accounts.
+    https://github.com/ansible/ansible/pull/46242 removes the assumption that
+    security groups must be in a VPC.

changelogs/fragments/reboot-unicode-string.yaml

@@ -0,0 +1,3 @@
+bugfixes:
+  - reboot - use unicode instead of bytes for stdout and stderr to match the
+    type returned from low_level_execute()

changelogs/fragments/reboot_openbsd_support.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - reboot - add support for OpenBSD

changelogs/fragments/windows-exec-changes.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- include better error handling for Windows errors to help with debugging module errors

docs/bin/plugin_formatter.py

@@ -689,7 +689,7 @@ def main():
             display.vv(key)
             display.vvvvv(pp.pformat(('record', record)))
             if record.get('doc', None):
-                short_desc = record['doc']['short_description']
+                short_desc = record['doc']['short_description'].rstrip('.')
                 if short_desc is None:
                     display.warning('short_description for %s is None' % key)
                     short_desc = ''

docs/docsite/rst/dev_guide/testing_documentation.rst

@@ -17,7 +17,7 @@ To check the HTML output of your module documentation:
 
 To build the HTML documentation for multiple modules, use a comma-separated list of module names: ``MODULES=my_code,my_other_code make webdocs``.
 
-To ensure that your documentation matches your ``argument_spec``, run the ``validate-modules`` test. Note that this option isn't currently enabled in Shippable due to the time it takes to run.
+To ensure that your documentation matches your ``argument_spec``, run the ``validate-modules`` test.
 
 .. code-block:: bash
 

docs/docsite/rst/network/getting_started/first_playbook.rst

@@ -2,7 +2,7 @@
 Run Your First Command and Playbook
 ***************************************************
 
-Put the concepts you learned to work with this quick tutorial. Install Ansible, execute a network configuration command manually, execute the same command with Ansible, then create a playbook so you can execute the command any time on multiple network devices. 
+Put the concepts you learned to work with this quick tutorial. Install Ansible, execute a network configuration command manually, execute the same command with Ansible, then create a playbook so you can execute the command any time on multiple network devices.
 
 .. contents:: Topics
 
@@ -86,22 +86,17 @@ The playbook contains one play with two tasks, and should generate output like t
 .. code-block:: bash
 
    $ ansible-playbook -i vyos.example.net, -u ansible -k -e ansible_network_os=vyos first_playbook.yml
-   
+
    PLAY [First Playbook]
    ***************************************************************************************************************************
-   
-   TASK [Gathering Facts]
-   ***************************************************************************************************************************
-   ok: [vyos.example.net]
 
    TASK [Get config for VyOS devices]
    ***************************************************************************************************************************
    ok: [vyos.example.net]
-   
+
    TASK [Display the config]
    ***************************************************************************************************************************
    ok: [vyos.example.net] => {
-       "failed": false, 
        "msg": "The hostname is vyos and the OS is VyOS"
    }
 
@@ -114,44 +109,38 @@ The extended first playbook has four tasks in a single play. Run it with the sam
 
 .. code-block:: bash
 
-   $ ansible-playbook -i vyos.example.net, -u ansible -k -e ansible_network_os=vyos first_playbook_ext.yml 
+   $ ansible-playbook -i vyos.example.net, -u ansible -k -e ansible_network_os=vyos first_playbook_ext.yml
 
    PLAY [First Playbook]
    ************************************************************************************************************************************
-   
-   TASK [Gathering Facts]
-   ***********************************************************************************************************************************
-   ok: [vyos.example.net]
-   
+
    TASK [Get config for VyOS devices]
    **********************************************************************************************************************************
    ok: [vyos.example.net]
 
    TASK [Display the config]
    *************************************************************************************************************************************
    ok: [vyos.example.net] => {
-       "failed": false, 
        "msg": "The hostname is vyos and the OS is VyOS"
    }
-   
+
    TASK [Update the hostname]
    *************************************************************************************************************************************
    changed: [vyos.example.net]
 
    TASK [Get changed config for VyOS devices]
    *************************************************************************************************************************************
    ok: [vyos.example.net]
-   
+
    TASK [Display the changed config]
    *************************************************************************************************************************************
    ok: [vyos.example.net] => {
-       "failed": false, 
        "msg": "The hostname is vyos-changed and the OS is VyOS"
    }
-   
+
    PLAY RECAP
    ************************************************************************************************************************************
-   vyos.example.net           : ok=6    changed=1    unreachable=0    failed=0   
+   vyos.example.net           : ok=6    changed=1    unreachable=0    failed=0
 
 
-This playbook is useful. However, running it still requires several command-line flags. Also, running a playbook against a single device is not a huge efficiency gain over making the same change manually. The next step to harnessing the full power of Ansible is to use an inventory file to organize your managed nodes into groups with information like the ``ansible_network_os`` and the SSH user. 
+This playbook is useful. However, running it still requires several command-line flags. Also, running a playbook against a single device is not a huge efficiency gain over making the same change manually. The next step to harnessing the full power of Ansible is to use an inventory file to organize your managed nodes into groups with information like the ``ansible_network_os`` and the SSH user.

docs/docsite/rst/network/getting_started/sample_files/first_playbook.yml

@@ -2,6 +2,7 @@
 
 - name: Network Getting Started First Playbook
   connection: network_cli
+  gather_facts: false
   hosts: all
   tasks:
 

docs/docsite/rst/network/getting_started/sample_files/first_playbook_ext.yml

@@ -2,6 +2,7 @@
 
 - name: Network Getting Started First Playbook Extended
   connection: network_cli
+  gather_facts: false
   hosts: all
   tasks:
 

docs/docsite/rst/reference_appendices/release_and_maintenance.rst

@@ -19,9 +19,6 @@ Ansible has a graduated support structure that extends to three major releases.
 For more information, read about the :ref:`development_and_stable_version_maintenance_workflow` or
 see the chart in :ref:`release_schedule` for the degrees to which current releases are supported.
 
-.. note:: Support for three major releases began with Ansible-2.4. Ansible-2.3 and older versions
-    are only supported for two releases.
-
 If you are using a release of Ansible that is no longer supported, we strongly
 encourage you to upgrade as soon as possible in order to benefit from the
 latest features and security fixes.
@@ -40,10 +37,11 @@ Release status
 ===============   ==========================   =================================================
 Ansible Release   Latest Version               Status
 ===============   ==========================   =================================================
-devel             2.7 (unreleased, trunk)      In development
-`2.6`_            2.6.1 (2018-07-05)           Supported (security **and** general bug fixes)
-`2.5`_            2.5.6 (2018-07-05)           Supported (security **and** critical bug fixes)
-`2.4`_            2.4.6 (2018-07-05)           Supported (security fixes)
+devel             2.8 (unreleased, trunk)      In development
+`2.7`_            2.7.0 (2018-10-04)           Supported (security **and** general bug fixes)
+`2.6`_            2.6.5 (2018-09-28)           Supported (security **and** critical bug fixes)
+`2.5`_            2.5.9 (2018-09-10)           Supported (security fixes)
+`2.4`_            2.4.6 (2018-07-05)           Unsupported (end of life)
 `2.3`_            2.3.3 (2017-12-20)           Unsupported (end of life)
 `2.2`_            2.2.3 (2017-05-09)           Unsupported (end of life)
 `2.1`_            2.1.6 (2017-06-01)           Unsupported (end of life)
@@ -58,6 +56,7 @@ devel             2.7 (unreleased, trunk)      In development
 
 .. Comment: devel used to point here but we're currently revamping our changelog process and have no
    link to a static changelog for devel _2.6: https://github.com/ansible/ansible/blob/devel/CHANGELOG.md
+.. _2.7: https://github.com/ansible/ansible/blob/stable-2.7/changelogs/CHANGELOG-v2.7.rst
 .. _2.6: https://github.com/ansible/ansible/blob/stable-2.6/changelogs/CHANGELOG-v2.6.rst
 .. _2.5: https://github.com/ansible/ansible/blob/stable-2.5/changelogs/CHANGELOG-v2.5.rst
 .. _2.4: https://github.com/ansible/ansible/blob/stable-2.4/CHANGELOG.md

docs/docsite/rst/reference_appendices/special_variables.rst

@@ -31,7 +31,7 @@ ansible_play_hosts_all
 ansible_playbook_python
     The path to the python interpreter being used by Ansible on the controller
 
-ansible_serach_path
+ansible_search_path
     Current search path for action plugins and lookups, i.e where we search for relative paths when you do ``template: src=myfile``
 
 ansible_verbosity

docs/docsite/rst/scenario_guides/guide_aws.rst

@@ -202,9 +202,9 @@ with remote hosts.
 Ansible With (And Versus) CloudFormation
 ````````````````````````````````````````
 
-CloudFormation is a Amazon technology for defining a cloud stack as a JSON document.   
+CloudFormation is a Amazon technology for defining a cloud stack as a JSON or YAML document.   
 
-Ansible modules provide an easier to use interface than CloudFormation in many examples, without defining a complex JSON document.
+Ansible modules provide an easier to use interface than CloudFormation in many examples, without defining a complex JSON/YAML document.
 This is recommended for most users.
 
 However, for users that have decided to use CloudFormation, there is an Ansible module that can be used to apply a CloudFormation template