Merge pull request #245 from saito-hideki/release_1.3.0

Release 1.3.0 commit

SUMMARY
New release 1.3.0
ISSUE TYPE

Feature Pull Request

COMPONENT NAME

ansible.posix

ADDITIONAL INFORMATION
None

Reviewed-by: Andrew Klychkov <aaklychkov@mail.ru>
Reviewed-by: Abhijeet Kasurde <None>
Reviewed-by: None <None>

.azure-pipelines/azure-pipelines.yml

@@ -36,7 +36,7 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.8.0
+      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
 
 pool: Standard
 
@@ -50,6 +50,32 @@ stages:
       - template: templates/matrix.yml
         parameters:
           testFormat: devel/linux/{0}/1
+          targets:
+            - name: CentOS 6
+              test: centos6
+            - name: CentOS 7
+              test: centos7
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 33
+              test: fedora33
+            - name: Fedora 34
+              test: fedora34
+            - name: openSUSE 15 py2
+              test: opensuse15py2
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 18.04
+              test: ubuntu1804
+            - name: Ubuntu 20.04
+              test: ubuntu2004
+  - stage: Docker_2_11
+    displayName: Docker 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.11/linux/{0}/1
           targets:
             - name: CentOS 6
               test: centos6
@@ -130,6 +156,24 @@ stages:
       - template: templates/matrix.yml
         parameters:
           testFormat: devel/{0}/1
+          targets:
+            - name: MacOS 11.1
+              test: macos/11.1
+            - name: RHEL 7.9
+              test: rhel/7.9
+            - name: RHEL 8.4
+              test: rhel/8.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
+            - name: FreeBSD 13.0
+              test: freebsd/13.0
+  - stage: Remote_2_11
+    displayName: Remote 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.11/{0}/1
           targets:
             - name: MacOS 11.1
               test: macos/11.1
@@ -186,7 +230,9 @@ stages:
       - Remote_2_9
       - Docker_2_9
       - Remote_2_10
+      - Remote_2_11
       - Docker_2_10
+      - Docker_2_11
       - Remote_devel
       - Docker_devel
     jobs:

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

@@ -7,7 +7,7 @@ set -o pipefail -eu
 
 output_path="$1"
 
-curl --silent --show-error https://codecov.io/bash > codecov.sh
+curl --silent --show-error https://ansible-ci-files.s3.us-east-1.amazonaws.com/codecov/codecov.sh > codecov.sh
 
 for file in "${output_path}"/reports/coverage*.xml; do
     name="${file}"

CHANGELOG.rst

@@ -5,6 +5,49 @@ ansible.posix Release Notes
 .. contents:: Topics
 
 
+v1.3.0
+======
+
+Release Summary
+---------------
+
+This is the minor release of the ``ansible.posix`` collection.
+This changelog contains all changes to the modules in this collection that
+have been added after the release of ``ansible.posix`` 1.2.0.
+
+Minor Changes
+-------------
+
+- acl - add new alias ``recurse`` for ``recursive`` parameter (https://github.com/ansible-collections/ansible.posix/issues/124).
+- added 2.11 branch to test matrix, added ignore-2.12.txt.
+- authorized_key - add ``no_log=False`` in ``argument_spec`` to clear false-positives of ``no-log-needed`` (https://github.com/ansible-collections/ansible.posix/pull/156).
+- authorized_key - add a list of valid key types (https://github.com/ansible-collections/ansible.posix/issues/134).
+- mount - Change behavior of ``boot`` option to set ``noauto`` on BSD nodes (https://github.com/ansible-collections/ansible.posix/issues/28).
+- mount - Change behavior of ``boot`` option to set ``noauto`` on Linux nodes (https://github.com/ansible-collections/ansible.posix/issues/28).
+- mount - add ``no_log=False`` in ``argument_spec`` to clear false-positives of ``no-log-needed`` (https://github.com/ansible-collections/ansible.posix/pull/156).
+- mount - returns ``backup_file`` value when a backup fstab is created.
+- synchronize - add ``delay_updates`` option (https://github.com/ansible-collections/ansible.posix/issues/157).
+- synchronize - fix typo (https://github.com/ansible-collections/ansible.posix/pull/198).
+
+Bugfixes
+--------
+
+- Synchronize module not recognizing remote ssh key (https://github.com/ansible-collections/ansible.posix/issues/24).
+- Synchronize not using quotes around arguments like --out-format (https://github.com/ansible-collections/ansible.posix/issues/190).
+- at - append line-separator to the end of the ``command`` (https://github.com/ansible-collections/ansible.posix/issues/169).
+- csh - define ``ECHO`` and ``COMMAND_SEP`` (https://github.com/ansible-collections/ansible.posix/issues/204).
+- firewalld - enable integration after migration (https://github.com/ansible-collections/ansible.posix/pull/239).
+- firewalld - ensure idempotency with firewalld 0.9.3 (https://github.com/ansible-collections/ansible.posix/issues/179).
+- firewalld - fix setting zone target to ``%%REJECT%%`` (https://github.com/ansible-collections/ansible.posix/pull/215).
+- mount - Handle ``boot`` option on Solaris correctly (https://github.com/ansible-collections/ansible.posix/issues/184).
+- synchronize - add ``community.podman.podman`` to the list of supported connection plugins (https://github.com/ansible-community/molecule-podman/issues/45).
+- synchronize - complete podman support for synchronize module.
+- synchronize - properly quote rsync CLI parameters (https://github.com/ansible-collections/ansible.posix/pull/241).
+- synchronize - replace removed ``ansible_ssh_user`` by ``ansible_user`` everywhere; do the same for ``ansible_ssh_port`` and ``ansible_ssh_host`` (https://github.com/ansible-collections/ansible.posix/issues/60).
+- synchronize - use SSH args from SSH connection plugin (https://github.com/ansible-collections/ansible.posix/issues/222).
+- synchronize - use become_user when invoking rsync on remote with sudo (https://github.com/ansible-collections/ansible.posix/issues/186).
+- sysctl - modifying conditional check for docker to fix tests being skipped (https://github.com/ansible-collections/ansible.posix/pull/226).
+
 v1.2.0
 ======
 
@@ -26,9 +69,9 @@ Bugfixes
 --------
 
 - at - add AIX support (https://github.com/ansible-collections/ansible.posix/pull/99).
-- synchronize - fix for private_key overriding in synchronize module.
 - synchronize - add ``community.docker.docker`` to the list of supported transports (https://github.com/ansible-collections/ansible.posix/issues/132).
 - synchronize - do not prepend PWD when path is in form user@server:path or server:path (https://github.com/ansible-collections/ansible.posix/pull/118).
+- synchronize - fix for private_key overriding in synchronize module.
 - sysctl - do not persist sysctl when value is invalid (https://github.com/ansible-collections/ansible.posix/pull/101).
 
 v1.1.1

README.md

@@ -6,7 +6,7 @@ https://dev.azure.com/ansible/ansible.posix/_apis/build/status/CI?branchName=mai
 
 <!-- Describe the collection and why a user would want to use it. What does the collection do? -->
 An Ansible Collection of modules and plugins that target POSIX UNIX/Linux and derivative Operating Systems.
- 
+
 ## Supported Versions of Ansible
 <!--start requires_ansible-->
 ## Ansible version compatibility
@@ -28,6 +28,7 @@ Name | Description
 [ansible.posix.at](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.at_module.rst)|Schedule the execution of a command or script file via the at command
 [ansible.posix.authorized_key](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.authorized_key_module.rst)|Adds or removes an SSH authorized key
 [ansible.posix.firewalld](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.firewalld_module.rst)|Manage arbitrary ports/services with firewalld
+[ansible.posix.firewalld_info](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.firewalld_info_module.rst)|Gather information about firewalld
 [ansible.posix.mount](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.mount_module.rst)|Control active and configured mount points
 [ansible.posix.patch](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.patch_module.rst)|Apply patch files using the GNU patch tool
 [ansible.posix.seboolean](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.seboolean_module.rst)|Toggles SELinux booleans
@@ -75,9 +76,7 @@ This collection follows the Ansible project's
 Please read and familiarize yourself with this document.
 
 ## Release notes
-
-* 0.1.1 Initial stable build
-* 0.1.0 Internal only build
+See [changelog](https://github.com/ansible-collections/ansible.posix/blob/main/CHANGELOG.rst) for more details.
 
 ## External requirements
 
@@ -87,9 +86,10 @@ None
 
 <!-- List the versions of Ansible the collection has been tested with. Must match what is in galaxy.yml. -->
 
-* ansible-base 2.11 (devel)
-* ansible-base 2.10 (Beta)
-* ansible-base 2.9 (stable)
+* ansible-core 2.12 (devel)
+* ansible-core 2.11 (stable)
+* ansible-base 2.10 (stable)
+* ansible 2.9 (stable)
 
 ## Roadmap
 

changelogs/changelog.yaml

@@ -107,11 +107,11 @@ releases:
     changes:
       bugfixes:
       - at - add AIX support (https://github.com/ansible-collections/ansible.posix/pull/99).
-      - synchronize - fix for private_key overriding in synchronize module.
       - synchronize - add ``community.docker.docker`` to the list of supported transports
         (https://github.com/ansible-collections/ansible.posix/issues/132).
       - synchronize - do not prepend PWD when path is in form user@server:path or
         server:path (https://github.com/ansible-collections/ansible.posix/pull/118).
+      - synchronize - fix for private_key overriding in synchronize module.
       - sysctl - do not persist sysctl when value is invalid (https://github.com/ansible-collections/ansible.posix/pull/101).
       minor_changes:
       - firewalld - bring the ``target`` feature back (https://github.com/ansible-collections/ansible.posix/issues/112).
@@ -134,3 +134,79 @@ releases:
     - firewalld_zone_target.yml
     - misc_fix.yml
     release_date: '2021-03-08'
+  1.3.0:
+    changes:
+      bugfixes:
+      - Synchronize module not recognizing remote ssh key (https://github.com/ansible-collections/ansible.posix/issues/24).
+      - Synchronize not using quotes around arguments like --out-format (https://github.com/ansible-collections/ansible.posix/issues/190).
+      - at - append line-separator to the end of the ``command`` (https://github.com/ansible-collections/ansible.posix/issues/169).
+      - csh - define ``ECHO`` and ``COMMAND_SEP`` (https://github.com/ansible-collections/ansible.posix/issues/204).
+      - firewalld - enable integration after migration (https://github.com/ansible-collections/ansible.posix/pull/239).
+      - firewalld - ensure idempotency with firewalld 0.9.3 (https://github.com/ansible-collections/ansible.posix/issues/179).
+      - firewalld - fix setting zone target to ``%%REJECT%%`` (https://github.com/ansible-collections/ansible.posix/pull/215).
+      - mount - Handle ``boot`` option on Solaris correctly (https://github.com/ansible-collections/ansible.posix/issues/184).
+      - synchronize - add ``community.podman.podman`` to the list of supported connection
+        plugins (https://github.com/ansible-community/molecule-podman/issues/45).
+      - synchronize - complete podman support for synchronize module.
+      - synchronize - properly quote rsync CLI parameters (https://github.com/ansible-collections/ansible.posix/pull/241).
+      - synchronize - replace removed ``ansible_ssh_user`` by ``ansible_user`` everywhere;
+        do the same for ``ansible_ssh_port`` and ``ansible_ssh_host`` (https://github.com/ansible-collections/ansible.posix/issues/60).
+      - synchronize - use SSH args from SSH connection plugin (https://github.com/ansible-collections/ansible.posix/issues/222).
+      - synchronize - use become_user when invoking rsync on remote with sudo (https://github.com/ansible-collections/ansible.posix/issues/186).
+      - sysctl - modifying conditional check for docker to fix tests being skipped
+        (https://github.com/ansible-collections/ansible.posix/pull/226).
+      minor_changes:
+      - acl - add new alias ``recurse`` for ``recursive`` parameter (https://github.com/ansible-collections/ansible.posix/issues/124).
+      - added 2.11 branch to test matrix, added ignore-2.12.txt.
+      - authorized_key - add ``no_log=False`` in ``argument_spec`` to clear false-positives
+        of ``no-log-needed`` (https://github.com/ansible-collections/ansible.posix/pull/156).
+      - authorized_key - add a list of valid key types (https://github.com/ansible-collections/ansible.posix/issues/134).
+      - mount - Change behavior of ``boot`` option to set ``noauto`` on BSD nodes
+        (https://github.com/ansible-collections/ansible.posix/issues/28).
+      - mount - Change behavior of ``boot`` option to set ``noauto`` on Linux nodes
+        (https://github.com/ansible-collections/ansible.posix/issues/28).
+      - mount - add ``no_log=False`` in ``argument_spec`` to clear false-positives
+        of ``no-log-needed`` (https://github.com/ansible-collections/ansible.posix/pull/156).
+      - mount - returns ``backup_file`` value when a backup fstab is created.
+      - synchronize - add ``delay_updates`` option (https://github.com/ansible-collections/ansible.posix/issues/157).
+      - synchronize - fix typo (https://github.com/ansible-collections/ansible.posix/pull/198).
+      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
+
+        This changelog contains all changes to the modules in this collection that
+
+        have been added after the release of ``ansible.posix`` 1.2.0.'
+    fragments:
+    - 1.3.0.yml
+    - 124_acl.yml
+    - 126_mount_not_returning_backup_file.yml
+    - 134_authorized_key.yml
+    - 156-fix_no-log-needed_false_positives.yml
+    - 159-fix-60-deprecated-ansible_ssh_user.yml
+    - 167-synchronize-add_delay_option.yml
+    - 169_add_lineseparator_to_command.yml
+    - 175_synchronize.yml
+    - 179_firewalld.yml
+    - 181-update_codecov_sh_url.yml
+    - 185_mount_at_boot.yml
+    - 187-fix-synchronize-become-user.yml
+    - 193_firewalld.yml
+    - 196_boot_opt_for_linux.yml
+    - 203_boot_opt_for_bsd.yml
+    - 204_csh_shell.yml
+    - 207-mount_tests.yml
+    - 213_quote_cmd_args.yml
+    - 214-add_firewalld_info_module.yml
+    - 215_fix_REJECT_target_name.yml
+    - 217-restructure_authrized_key_test.yml
+    - 222_synchronize.yml
+    - 226_sysctl_fix_integration_test.yml
+    - 229_add_podman_connection_plugin_to_synchronize.yml
+    - 230_complete_podman_support_for_synchronize.yml
+    - 233-fix-wrong-firewalld-version-info.yml
+    - 241-synchronize-shell-quoting.yml
+    - firewalld_integ_test.yml
+    - firewalld_test.yml
+    - sanity_test_ignore_file.yml
+    - synchronize.yml
+    - test_matrix.yml
+    release_date: '2021-08-11'

changelogs/config.yaml

@@ -2,7 +2,7 @@ changelog_filename_template: ../CHANGELOG.rst
 changelog_filename_version_depth: 0
 changes_file: changelog.yaml
 changes_format: combined
-keep_fragments: true
+keep_fragments: false
 mention_ancestor: true
 new_plugins_after_name: removed_features
 notesdir: fragments

changelogs/fragments/1.2.0.yml

@@ -1,4 +0,0 @@
-release_summary: |-
-  This is the minor release of the ``ansible.posix`` collection.
-  This changelog contains all changes to the modules in this collection that
-  have been added after the release of ``ansible.posix`` 1.1.0.

changelogs/fragments/101-sysctl-dont-persist-when-invalid.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - sysctl - do not persist sysctl when value is invalid (https://github.com/ansible-collections/ansible.posix/pull/101).

changelogs/fragments/11-action-plugins-use-fqcn.yml

@@ -1,4 +0,0 @@
----
-bugfixes:
-  - patch - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11)
-  - synchronize - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11)

changelogs/fragments/118-synchronize_bugfix.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "synchronize - do not prepend PWD when path is in form user@server:path or server:path (https://github.com/ansible-collections/ansible.posix/pull/118)."

changelogs/fragments/120-synchronize_add_option.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- synchronize - add the ``ssh_connection_multiplexing`` option to allow SSH connection multiplexing (https://github.com/ansible/ansible/issues/24365).

changelogs/fragments/12_migrate_cgroup_perf_recap_graph.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Migrate hacking/cgroup_perf_recap_graph.py to this collection, since the cgroup_perf_recap callback lives here.

changelogs/fragments/144_add_community_docker_connection_plugin_alias.yml

@@ -1,4 +0,0 @@
----
-bugfixes:
-  - synchronize - add ``community.docker.docker`` to the list of supported
-    transports (https://github.com/ansible-collections/ansible.posix/issues/132).

changelogs/fragments/14_mount_option.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Mount - Handle remount with new options (https://github.com/ansible/ansible/issues/59460).

changelogs/fragments/15_profile_tasks.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Profile_tasks - result was a odict_items which is not subscriptable, so the slicing was failing (https://github.com/ansible/ansible/issues/59059).

changelogs/fragments/17_authorized_keys.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- authorized_keys - Added FIDO2 security keys (https://github.com/ansible-collections/ansible.posix/issues/17).

changelogs/fragments/19_enable_tags.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Enabled tags in galaxy.yml (https://github.com/ansible-collections/ansible.posix/issues/18).

changelogs/fragments/21-mount-module_util-routing-issue.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - mount - fix issues with ismount module_util pathing for Ansible 2.9 (fixes https://github.com/ansible-collections/ansible.posix/issues/21)

changelogs/fragments/23-selinux-doesnt-create-missing-config-keys.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - selinux - add missing configuration keys for /etc/selinux/config (https://github.com/ansible-collections/ansible.posix/issues/23)

changelogs/fragments/25_ansible_metadata.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Removed ANSIBLE_METADATA from all the modules.

changelogs/fragments/26_profile_tasks_doc.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Typecast results before use in profile_tasks callback (https://github.com/ansible/ansible/issues/69563).

changelogs/fragments/27_update_examples.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Update EXAMPLES section in modules to use FQCN.

changelogs/fragments/33_mount.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Revert "mount - Check if src exists before mounted (ansible/ansible#61752)".

changelogs/fragments/35_disable_tests.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Revert "Enable at, patch and synchronize tests (https://github.com/ansible-collections/ansible.posix/pull/5)".

changelogs/fragments/37-authorized_keys-inconsistent-check-mode-values.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - authorized_keys - fix inconsistent return value for check mode (https://github.com/ansible-collections/ansible.posix/issues/37)

changelogs/fragments/39_remove_license.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Remove license key from galaxy.yml.

changelogs/fragments/43_remove_shippable.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Remove sanity jobs from shippable (https://github.com/ansible-collections/ansible.posix/pull/43).

changelogs/fragments/4_update_readme.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Update README.md (https://github.com/ansible-collections/ansible.posix/pull/4/).

changelogs/fragments/5_enable_tests.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Enable tests for at, patch and synchronize modules (https://github.com/ansible-collections/ansible.posix/pull/5).

changelogs/fragments/65931-json-callback-non-lockstep-output.yml

@@ -1,4 +0,0 @@
-bugfixes:
-- json callback - Fix host result to task references in the resultant JSON
-  output for non-lockstep strategy plugins such as free
-  (https://github.com/ansible/ansible/issues/65931)

changelogs/fragments/6_test_devel.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- CI should use devel (https://github.com/ansible-collections/ansible.posix/pull/6).

changelogs/fragments/74_synchronize_docker.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Fix synchronize to work with renamed docker and buildah connection plugins.

changelogs/fragments/7_env.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Allow unsetting existing environment vars via environment by specifying a null value (https://github.com/ansible/ansible/pull/68236).

changelogs/fragments/82-private-key-override-fix.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - synchronize - fix for private_key overriding in synchronize module.

changelogs/fragments/99-at_add_aix_support.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- at - add AIX support (https://github.com/ansible-collections/ansible.posix/pull/99).

changelogs/fragments/firewalld_migration.yml

@@ -1,3 +0,0 @@
----
-minor_changes:
-  - firewalld - add firewalld module to ansible.posix collection

changelogs/fragments/firewalld_zone_target.yml

@@ -1,2 +0,0 @@
-minor_changes:
-  - firewalld - bring the ``target`` feature back (https://github.com/ansible-collections/ansible.posix/issues/112).

changelogs/fragments/initial_commit.yaml

@@ -1,2 +0,0 @@
-major_changes:
-- Bootstrap Collection (https://github.com/ansible-collections/ansible.posix/pull/1).

changelogs/fragments/misc_fix.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- fix sanity test for various modules.

changelogs/fragments/skippy_deprecation.yml

@@ -1,3 +0,0 @@
----
-minor_changes:
-  - skippy - fixed the deprecation warning (by date) for skippy callback plugin

docs/ansible.posix.acl_module.rst

@@ -59,7 +59,7 @@ Parameters
                     <b>entity</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -74,7 +74,7 @@ Parameters
                     <b>entry</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -94,7 +94,7 @@ Parameters
                     <b>etype</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -151,13 +151,14 @@ Parameters
                     <b>permissions</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
                 </td>
                 <td>
-                        <div>The permissions to apply/remove can be any combination of <code>r</code>, <code>w</code>, <code>x</code> (read, write and execute respectively), and <code>X</code> (execute permission if the file is a directory or already has execute permission for some user)</div>
+                        <div>The permissions to apply/remove can be any combination of <code>r</code>, <code>w</code>, <code>x</code></div>
+                        <div>(read, write and execute respectively), and <code>X</code> (execute permission if the file is a directory or already has execute permission for some user)</div>
                 </td>
             </tr>
             <tr>
@@ -166,7 +167,7 @@ Parameters
                     <b>recalculate_mask</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -200,6 +201,8 @@ Parameters
                 <td>
                         <div>Recursively sets the specified ACL.</div>
                         <div>Incompatible with <code>state=query</code>.</div>
+                        <div>Alias <code>recurse</code> added in version 1.3.0.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: recurse</div>
                 </td>
             </tr>
             <tr>
@@ -208,7 +211,7 @@ Parameters
                     <b>state</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -259,7 +262,7 @@ Notes
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Grant user Joe read access to a file
       ansible.posix.acl:

docs/ansible.posix.at_module.rst

@@ -62,7 +62,6 @@ Parameters
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
                         <span style="color: purple">integer</span>
-                         / <span style="color: red">required</span>
                     </div>
                 </td>
                 <td>
@@ -131,7 +130,6 @@ Parameters
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
                         <span style="color: purple">string</span>
-                         / <span style="color: red">required</span>
                     </div>
                 </td>
                 <td>
@@ -155,7 +153,7 @@ Parameters
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Schedule a command to execute in 20 minutes as root
       ansible.posix.at:

docs/ansible.posix.authorized_key_module.rst

@@ -113,7 +113,7 @@ Parameters
                     <b>key_options</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -226,7 +226,7 @@ Parameters
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Set authorized key taken from file
       ansible.posix.authorized_key:

docs/ansible.posix.firewalld_info_module.rst

@@ -0,0 +1,520 @@
+.. _ansible.posix.firewalld_info_module:
+
+
+****************************
+ansible.posix.firewalld_info
+****************************
+
+**Gather information about firewalld**
+
+
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Synopsis
+--------
+- This module gathers information about firewalld rules.
+
+
+
+Requirements
+------------
+The below requirements are needed on the host that executes this module.
+
+- firewalld >= 0.2.11
+- python-firewall
+- python-dbus
+
+
+Parameters
+----------
+
+.. raw:: html
+
+    <table  border=0 cellpadding=0 class="documentation-table">
+        <tr>
+            <th colspan="1">Parameter</th>
+            <th>Choices/<font color="blue">Defaults</font></th>
+            <th width="100%">Comments</th>
+        </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>active_zones</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>Gather information about active zones.</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>zones</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=string</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Gather information about specific zones.</div>
+                        <div>If only works if <code>active_zones</code> is set to <code>false</code>.</div>
+                </td>
+            </tr>
+    </table>
+    <br/>
+
+
+
+
+Examples
+--------
+
+.. code-block:: yaml
+
+    - name: Gather information about active zones
+      ansible.posix.firewalld_info:
+        active_zones: yes
+
+    - name: Gather information about specific zones
+      ansible.posix.firewalld_info:
+        zones:
+          - public
+          - external
+          - internal
+
+
+
+Return Values
+-------------
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+
+.. raw:: html
+
+    <table border=0 cellpadding=0 class="documentation-table">
+        <tr>
+            <th colspan="4">Key</th>
+            <th>Returned</th>
+            <th width="100%">Description</th>
+        </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>active_zones</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>Gather active zones only if turn it <code>true</code>.</div>
+                    <br/>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>collected_zones</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of collected zones.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;external&#x27;, &#x27;internal&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>firewalld_info</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">complex</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>Returns various information about firewalld configuration.</div>
+                    <br/>
+                </td>
+            </tr>
+                                <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>default_zones</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The zone name of default zone.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">public</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>version</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The version information of firewalld.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">0.8.2</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>zones</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">complex</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A dict of zones to gather information.</div>
+                    <br/>
+                </td>
+            </tr>
+                                <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>zone</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">complex</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The zone name registered in firewalld.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">external</div>
+                </td>
+            </tr>
+                                <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>forward</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The network interface forwarding.</div>
+                            <div>This parameter supports on python-firewall 0.9.0(or later) and is not collected in earlier versions.</div>
+                    <br/>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>forward_ports</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of forwarding port pair with protocol.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;icmp&#x27;, &#x27;ipv6-icmp&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>icmp_block_inversion</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The ICMP block inversion to block all ICMP requests.</div>
+                    <br/>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>icmp_blocks</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of blocking icmp protocol.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;echo-request&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>interfaces</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of network interfaces.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;eth0&#x27;, &#x27;eth1&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>masquerade</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>The network interface masquerading.</div>
+                    <br/>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>ports</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of network port with protocol.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[[&#x27;22&#x27;, &#x27;tcp&#x27;], [&#x27;80&#x27;, &#x27;tcp&#x27;]]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>protocols</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of network protocol.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;icmp&#x27;, &#x27;ipv6-icmp&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>rich_rules</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of rich language rule.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;rule protocol value=&quot;icmp&quot; reject&#x27;, &#x27;rule priority=&quot;32767&quot; reject&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>services</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of network services.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;dhcp&#x27;, &#x27;dns&#x27;, &#x27;ssh&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>source_ports</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of network source port with protocol.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[[&#x27;30000&#x27;, &#x27;tcp&#x27;], [&#x27;30001&#x27;, &#x27;tcp&#x27;]]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>sources</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of source network address.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;172.16.30.0/24&#x27;, &#x27;172.16.31.0/24&#x27;]</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                    <td class="elbow-placeholder">&nbsp;</td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>target</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of services in the zone.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">ACCEPT</div>
+                </td>
+            </tr>
+
+
+
+            <tr>
+                <td colspan="4">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>undefined_zones</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">list</span>
+                    </div>
+                </td>
+                <td>success</td>
+                <td>
+                            <div>A list of undefined zones in <code>zones</code> option.</div>
+                            <div><code>undefined_zones</code> will be ignored for gathering process.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">[&#x27;foo&#x27;, &#x27;bar&#x27;]</div>
+                </td>
+            </tr>
+    </table>
+    <br/><br/>
+
+
+Status
+------
+
+
+Authors
+~~~~~~~
+
+- Hideki Saito (@saito-hideki)

docs/ansible.posix.firewalld_module.rst

@@ -34,12 +34,12 @@ Parameters
 
     <table  border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="1">Parameter</th>
+            <th colspan="2">Parameter</th>
             <th>Choices/<font color="blue">Defaults</font></th>
             <th width="100%">Comments</th>
         </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>icmp_block</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -54,7 +54,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>icmp_block_inversion</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -69,7 +69,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>immediate</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -88,7 +88,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>interface</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -103,7 +103,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>masquerade</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -118,7 +118,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>offline</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -137,7 +137,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>permanent</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -153,12 +153,12 @@ Parameters
                 </td>
                 <td>
                         <div>Should this configuration be in the running firewalld configuration or persist across reboots.</div>
-                        <div>As of Ansible 2.3, permanent operations can operate on firewalld configs when it is not running (requires firewalld &gt;= 3.0.9).</div>
+                        <div>As of Ansible 2.3, permanent operations can operate on firewalld configs when it is not running (requires firewalld &gt;= 0.3.9).</div>
                         <div>Note that if this is <code>no</code>, immediate is assumed <code>yes</code>.</div>
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>port</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -174,12 +174,13 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>port_forward</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">string</span>
+                        <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=dictionary</span>
                     </div>
                 </td>
                 <td>
@@ -188,8 +189,80 @@ Parameters
                         <div>Port and protocol to forward using firewalld.</div>
                 </td>
             </tr>
-            <tr>
+                                <tr>
+                    <td class="elbow-placeholder"></td>
                 <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>port</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                         / <span style="color: red">required</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Source port to forward from</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>proto</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                         / <span style="color: red">required</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>udp</li>
+                                    <li>tcp</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>protocol to forward</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>toaddr</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Optional address to forward to</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>toport</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                         / <span style="color: red">required</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>destination port</div>
+                </td>
+            </tr>
+
+            <tr>
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>rich_rule</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -205,7 +278,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>service</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -221,7 +294,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>source</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -236,7 +309,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>state</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -260,7 +333,30 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>target</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 1.2.0</div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>default</li>
+                                    <li>ACCEPT</li>
+                                    <li>DROP</li>
+                                    <li>%%REJECT%%</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>firewalld Zone target</div>
+                        <div>If state is set to <code>absent</code>, this will reset the target to default</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>timeout</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -272,11 +368,11 @@ Parameters
                         <b>Default:</b><br/><div style="color: blue">0</div>
                 </td>
                 <td>
-                        <div>The amount of time the rule should be in effect for when non-permanent.</div>
+                        <div>The amount of time in seconds the rule should be in effect for when non-permanent.</div>
                 </td>
             </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>zone</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -311,7 +407,7 @@ Notes
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: permit traffic in default zone for https service
       ansible.posix.firewalld:
@@ -375,13 +471,15 @@ Examples
         permanent: yes
         icmp_block: echo-request
 
-    - name: Redirect port 443 to 8443
-      become: yes
+    - ansible.posix.firewalld:
+        zone: internal
+        state: present
+        permanent: yes
+        target: ACCEPT
+
+    - name: Redirect port 443 to 8443 with Rich Rule
       ansible.posix.firewalld:
-        port_forward:
-          - port: 443
-            proto: tcp
-            toport: 8443
+        rich_rule: rule family=ipv4 forward-port port=443 protocol=tcp to-port=8443
         zone: public
         permanent: yes
         immediate: yes
@@ -389,6 +487,7 @@ Examples
 
 
 
+
 Status
 ------
 

docs/ansible.posix.mount_module.rst

@@ -69,7 +69,10 @@ Parameters
                 </td>
                 <td>
                         <div>Determines if the filesystem should be mounted on boot.</div>
-                        <div>Only applies to Solaris systems.</div>
+                        <div>Only applies to Solaris and Linux systems.</div>
+                        <div>For Solaris systems, <code>true</code> will set <code>yes</code> as the value of mount at boot in <em>/etc/vfstab</em>.</div>
+                        <div>For Linux, FreeBSD, NetBSD and OpenBSD systems, <code>false</code> will add <code>noauto</code> to mount options in <em>/etc/fstab</em>.</div>
+                        <div>To avoid mount option conflicts, if <code>noauto</code> specified in <code>opts</code>, mount module will ignore <code>boot</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -235,7 +238,7 @@ Notes
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     # Before 2.3, option 'name' was used instead of 'path'
     - name: Mount DVD read-only
@@ -296,6 +299,15 @@ Examples
         state: mounted
         fstype: nfs
 
+    - name: Mount NFS volumes with noauto according to boot option
+      ansible.posix.mount:
+        src: 192.168.1.100:/nfs/ssd/shared_data
+        path: /mnt/shared_data
+        opts: rw,sync,hard,intr
+        boot: no
+        state: mounted
+        fstype: nfs
+
 
 
 

docs/ansible.posix.patch_module.rst

@@ -212,7 +212,7 @@ Notes
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Apply patch to one file
       ansible.posix.patch:

docs/ansible.posix.seboolean_module.rst

@@ -65,7 +65,7 @@ Parameters
                     <b>name</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                          / <span style="color: red">required</span>
                     </div>
                 </td>
@@ -129,7 +129,7 @@ Notes
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Set httpd_can_network_connect flag on and keep it persistent across reboots
       ansible.posix.seboolean:

docs/ansible.posix.selinux_module.rst

@@ -47,7 +47,7 @@ Parameters
                     <b>configfile</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -64,13 +64,13 @@ Parameters
                     <b>policy</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
                 </td>
                 <td>
-                        <div>The name of the SELinux policy to use (e.g. <code>targeted</code>) will be required if state is not <code>disabled</code>.</div>
+                        <div>The name of the SELinux policy to use (e.g. <code>targeted</code>) will be required if <em>state</em> is not <code>disabled</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -79,7 +79,7 @@ Parameters
                     <b>state</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                          / <span style="color: red">required</span>
                     </div>
                 </td>
@@ -103,7 +103,7 @@ Parameters
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Enable SELinux
       ansible.posix.selinux:

docs/ansible.posix.synchronize_module.rst

@@ -113,6 +113,26 @@ Parameters
                         <div>Copy symlinks as the item that they point to (the referent) is copied, rather than the symlink.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>delay_updates</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 1.3.0</div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>no</li>
+                                    <li><div style="color: blue"><b>yes</b>&nbsp;&larr;</div></li>
+                        </ul>
+                </td>
+                <td>
+                        <div>This option puts the temporary file from each updated file into a holding directory until the end of the transfer, at which time all the files are renamed into place in rapid succession.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -129,9 +149,9 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Delete files in <code>dest</code> that don&#x27;t exist (after transfer, not before) in the <code>src</code> path.</div>
-                        <div>This option requires <code>recursive=yes</code>.</div>
-                        <div>This option ignores excluded files and behaves like the rsync opt --delete-excluded.</div>
+                        <div>Delete files in <em>dest</em> that do not exist (after transfer, not before) in the <em>src</em> path.</div>
+                        <div>This option requires <em>recursive=yes</em>.</div>
+                        <div>This option ignores excluded files and behaves like the rsync opt <code>--delete-after</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -165,7 +185,7 @@ Parameters
                 <td>
                         <div>Port number for ssh on the destination host.</div>
                         <div>Prior to Ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.</div>
-                        <div>This parameter defaults to the value of <code>ansible_ssh_port</code> or <code>ansible_port</code>, the <code>remote_port</code> config setting or the value from ssh client configuration if none of the former have been set.</div>
+                        <div>This parameter defaults to the value of <code>ansible_port</code>, the <code>remote_port</code> config setting or the value from ssh client configuration if none of the former have been set.</div>
                 </td>
             </tr>
             <tr>
@@ -233,6 +253,7 @@ Parameters
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
                         <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=string</span>
                     </div>
                 </td>
                 <td>
@@ -384,6 +405,7 @@ Parameters
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
                         <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=string</span>
                     </div>
                 </td>
                 <td>
@@ -463,6 +485,27 @@ Parameters
                         <div>The path can be absolute or relative.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>ssh_connection_multiplexing</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>SSH connection multiplexing for rsync is disabled by default to prevent misconfigured ControlSockets from resulting in failed SSH connections. This is accomplished by setting the SSH <code>ControlSocket</code> to <code>none</code>.</div>
+                        <div>Set this option to <code>yes</code> to allow multiplexing and reduce SSH connection overhead.</div>
+                        <div>Note that simply setting this option to <code>yes</code> is not enough; You must also configure SSH connection multiplexing in your SSH client config by setting values for <code>ControlMaster</code>, <code>ControlPersist</code> and <code>ControlPath</code>.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -499,7 +542,8 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Use the ssh_args specified in ansible.cfg.</div>
+                        <div>In Ansible 2.10 and lower, it uses the ssh_args specified in <code>ansible.cfg</code>.</div>
+                        <div>In Ansible 2.11 and onwards, when set to <code>true</code>, it uses all SSH connection configurations like <code>ansible_ssh_args</code>, <code>ansible_ssh_common_args</code>, and <code>ansible_ssh_extra_args</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -542,7 +586,7 @@ Notes
    - Inspect the verbose output to validate the destination user/host/path are what was expected.
    - To exclude files and directories from being synchronized, you may add ``.rsync-filter`` files to the source directory.
    - rsync daemon must be up and running with correct permission when using rsync protocol in source or destination path.
-   - The ``synchronize`` module forces `--delay-updates` to avoid leaving a destination in a broken in-between state if the underlying rsync process encounters an error. Those synchronizing large numbers of files that are willing to trade safety for performance should call rsync directly.
+   - The ``synchronize`` module enables `--delay-updates` by default to avoid leaving a destination in a broken in-between state if the underlying rsync process encounters an error. Those synchronizing large numbers of files that are willing to trade safety for performance should disable this option.
    - link_destination is subject to the same limitations as the underlying rsync daemon. Hard links are only preserved if the relative subtrees of the source and destination are the same. Attempts to hardlink into a directory that is a subdirectory of the source will be prevented.
 
 
@@ -560,7 +604,7 @@ See Also
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     - name: Synchronization of src on the control machine to dest on the remote hosts
       ansible.posix.synchronize:
@@ -678,7 +722,7 @@ Examples
     # Specify the rsync binary to use on remote host and on local host
     - hosts: groupofhosts
       vars:
-            ansible_rsync_path: /usr/gnu/bin/rsync
+        ansible_rsync_path: /usr/gnu/bin/rsync
 
       tasks:
         - name: copy /tmp/localpath/ to remote location /tmp/remotepath

docs/ansible.posix.sysctl_module.rst

@@ -58,14 +58,14 @@ Parameters
                     <b>name</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                          / <span style="color: red">required</span>
                     </div>
                 </td>
                 <td>
                 </td>
                 <td>
-                        <div>The dot-separated path (aka <em>key</em>) specifying the sysctl variable.</div>
+                        <div>The dot-separated path (also known as <em>key</em>) specifying the sysctl variable.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: key</div>
                 </td>
             </tr>
@@ -94,7 +94,7 @@ Parameters
                     <b>state</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -113,7 +113,7 @@ Parameters
                     <b>sysctl_file</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">path</span>
                     </div>
                 </td>
                 <td>
@@ -148,7 +148,7 @@ Parameters
                     <b>value</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">-</span>
+                        <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>
@@ -167,7 +167,7 @@ Parameters
 Examples
 --------
 
-.. code-block:: yaml+jinja
+.. code-block:: yaml
 
     # Set vm.swappiness to 5 in /etc/sysctl.conf
     - ansible.posix.sysctl:
@@ -212,4 +212,4 @@ Status
 Authors
 ~~~~~~~
 
-- David CHANIAL (@davixx) <david.chanial@gmail.com>
+- David CHANIAL (@davixx)

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: ansible
 name: posix
-version: 1.2.0
+version: 1.3.0
 readme: README.md
 authors:
   - Ansible (github.com/ansible)

plugins/action/synchronize.py

@@ -21,6 +21,7 @@ import os.path
 
 from ansible import constants as C
 from ansible.module_utils.six import string_types
+from ansible.module_utils.six.moves import shlex_quote
 from ansible.module_utils._text import to_text
 from ansible.module_utils.common._collections_compat import MutableSequence
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -28,6 +29,11 @@ from ansible.plugins.action import ActionBase
 from ansible.plugins.loader import connection_loader
 
 
+DOCKER = ['docker', 'community.general.docker', 'community.docker.docker']
+PODMAN = ['podman', 'ansible.builtin.podman', 'containers.podman.podman']
+BUILDAH = ['buildah', 'containers.podman.buildah']
+
+
 class ActionModule(ActionBase):
 
     def _get_absolute_path(self, path):
@@ -66,13 +72,12 @@ class ActionModule(ActionBase):
             return path
 
         # If using docker or buildah, do not add user information
-        if self._remote_transport not in ['docker', 'community.general.docker', 'community.docker.docker', 'buildah', 'containers.podman.buildah'] and user:
+        if self._remote_transport not in DOCKER + PODMAN + BUILDAH and user:
             user_prefix = '%s@' % (user, )
 
         if self._host_is_ipv6_address(host):
             return '[%s%s]:%s' % (user_prefix, host, path)
-        else:
-            return '%s%s:%s' % (user_prefix, host, path)
+        return '%s%s:%s' % (user_prefix, host, path)
 
     def _process_origin(self, host, path, user):
 
@@ -172,12 +177,25 @@ class ActionModule(ActionBase):
 
         # Store remote connection type
         self._remote_transport = self._connection.transport
+        use_ssh_args = _tmp_args.pop('use_ssh_args', None)
+
+        if use_ssh_args and self._connection.transport == 'ssh':
+            ssh_args = [
+                self._connection.get_option('ssh_args'),
+                self._connection.get_option('ssh_common_args'),
+                self._connection.get_option('ssh_extra_args'),
+            ]
+            _tmp_args['ssh_args'] = ' '.join([a for a in ssh_args if a])
 
         # Handle docker connection options
-        if self._remote_transport in ['docker', 'community.general.docker', 'community.docker.docker']:
+        if self._remote_transport in DOCKER:
             self._docker_cmd = self._connection.docker_cmd
             if self._play_context.docker_extra_args:
                 self._docker_cmd = "%s %s" % (self._docker_cmd, self._play_context.docker_extra_args)
+        elif self._remote_transport in PODMAN:
+            self._docker_cmd = self._connection._options['podman_executable']
+            if self._connection._options.get('podman_extra_args'):
+                self._docker_cmd = "%s %s" % (self._docker_cmd, self._connection._options['podman_extra_args'])
 
         # self._connection accounts for delegate_to so
         # remote_transport is the transport ansible thought it would need
@@ -195,8 +213,8 @@ class ActionModule(ActionBase):
 
         # ssh paramiko docker buildah and local are fully supported transports.  Anything
         # else only works with delegate_to
-        if delegate_to is None and self._connection.transport not in \
-                ('ssh', 'paramiko', 'local', 'docker', 'community.general.docker', 'community.docker.docker', 'buildah', 'containers.podman.buildah'):
+        if delegate_to is None and self._connection.transport not in [
+                'ssh', 'paramiko', 'local'] + DOCKER + PODMAN + BUILDAH:
             result['failed'] = True
             result['msg'] = (
                 "synchronize uses rsync to function. rsync needs to connect to the remote "
@@ -205,8 +223,6 @@ class ActionModule(ActionBase):
                 "so it cannot work." % self._connection.transport)
             return result
 
-        use_ssh_args = _tmp_args.pop('use_ssh_args', None)
-
         # Parameter name needed by the ansible module
         _tmp_args['_local_rsync_path'] = task_vars.get('ansible_rsync_path') or 'rsync'
         _tmp_args['_local_rsync_password'] = task_vars.get('ansible_ssh_pass') or task_vars.get('ansible_password')
@@ -219,14 +235,10 @@ class ActionModule(ActionBase):
         src_host = '127.0.0.1'
         inventory_hostname = task_vars.get('inventory_hostname')
         dest_host_inventory_vars = task_vars['hostvars'].get(inventory_hostname)
-        try:
-            dest_host = dest_host_inventory_vars['ansible_host']
-        except KeyError:
-            dest_host = dest_host_inventory_vars.get('ansible_ssh_host', inventory_hostname)
+        dest_host = dest_host_inventory_vars.get('ansible_host', inventory_hostname)
 
         dest_host_ids = [hostid for hostid in (dest_host_inventory_vars.get('inventory_hostname'),
-                                               dest_host_inventory_vars.get('ansible_host'),
-                                               dest_host_inventory_vars.get('ansible_ssh_host'))
+                                               dest_host_inventory_vars.get('ansible_host'))
                          if hostid is not None]
 
         localhost_ports = set()
@@ -250,7 +262,7 @@ class ActionModule(ActionBase):
             dest_is_local = True
 
         # CHECK FOR NON-DEFAULT SSH PORT
-        inv_port = task_vars.get('ansible_ssh_port', None) or C.DEFAULT_REMOTE_PORT
+        inv_port = task_vars.get('ansible_port', None) or C.DEFAULT_REMOTE_PORT
         if _tmp_args.get('dest_port', None) is None:
             if inv_port is not None:
                 _tmp_args['dest_port'] = inv_port
@@ -327,14 +339,14 @@ class ActionModule(ActionBase):
             # Src and dest rsync "path" handling
             if boolean(_tmp_args.get('set_remote_user', 'yes'), strict=False):
                 if use_delegate:
-                    user = task_vars.get('ansible_delegated_vars', dict()).get('ansible_ssh_user', None)
+                    user = task_vars.get('ansible_delegated_vars', dict()).get('ansible_user', None)
                     if not user:
-                        user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
+                        user = task_vars.get('ansible_user') or self._play_context.remote_user
                     if not user:
                         user = C.DEFAULT_REMOTE_USER
 
                 else:
-                    user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
+                    user = task_vars.get('ansible_user') or self._play_context.remote_user
 
             # Private key handling
             # Use the private_key parameter if passed else use context private_key_file
@@ -367,11 +379,14 @@ class ActionModule(ActionBase):
         if not dest_is_local:
             # don't escalate for docker. doing --rsync-path with docker exec fails
             # and we can switch directly to the user via docker arguments
-            if self._play_context.become and not rsync_path and self._remote_transport not in ['docker', 'community.general.docker', 'community.docker.docker']:
+            if self._play_context.become and not rsync_path and self._remote_transport not in DOCKER + PODMAN:
                 # If no rsync_path is set, become was originally set, and dest is
                 # remote then add privilege escalation here.
                 if self._play_context.become_method == 'sudo':
-                    rsync_path = 'sudo rsync'
+                    if self._play_context.become_user:
+                        rsync_path = 'sudo -u %s rsync' % self._play_context.become_user
+                    else:
+                        rsync_path = 'sudo rsync'
                 # TODO: have to add in the rest of the become methods here
 
             # We cannot use privilege escalation on the machine running the
@@ -381,19 +396,9 @@ class ActionModule(ActionBase):
 
         _tmp_args['rsync_path'] = rsync_path
 
-        if use_ssh_args:
-            ssh_args = [
-                getattr(self._play_context, 'ssh_args', ''),
-                getattr(self._play_context, 'ssh_common_args', ''),
-                getattr(self._play_context, 'ssh_extra_args', ''),
-            ]
-            _tmp_args['ssh_args'] = ' '.join([a for a in ssh_args if a])
-
         # If launching synchronize against docker container
         # use rsync_opts to support container to override rsh options
-        if self._remote_transport in [
-            'docker', 'community.general.docker', 'community.docker.docker', 'buildah', 'containers.podman.buildah'
-        ] and not use_delegate:
+        if self._remote_transport in DOCKER + BUILDAH + PODMAN and not use_delegate:
             # Replicate what we do in the module argumentspec handling for lists
             if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence):
                 tmp_rsync_opts = _tmp_args.get('rsync_opts', [])
@@ -406,15 +411,15 @@ class ActionModule(ActionBase):
             if '--blocking-io' not in _tmp_args['rsync_opts']:
                 _tmp_args['rsync_opts'].append('--blocking-io')
 
-            if self._remote_transport in ['docker', 'community.general.docker', 'community.docker.docker']:
+            if self._remote_transport in DOCKER + PODMAN:
                 if become and self._play_context.become_user:
-                    _tmp_args['rsync_opts'].append("--rsh=%s exec -u %s -i" % (self._docker_cmd, self._play_context.become_user))
+                    _tmp_args['rsync_opts'].append('--rsh=' + shlex_quote('%s exec -u %s -i' % (self._docker_cmd, self._play_context.become_user)))
                 elif user is not None:
-                    _tmp_args['rsync_opts'].append("--rsh=%s exec -u %s -i" % (self._docker_cmd, user))
+                    _tmp_args['rsync_opts'].append('--rsh=' + shlex_quote('%s exec -u %s -i' % (self._docker_cmd, user)))
                 else:
-                    _tmp_args['rsync_opts'].append("--rsh=%s exec -i" % self._docker_cmd)
-            elif self._remote_transport in ['buildah', 'containers.podman.buildah']:
-                _tmp_args['rsync_opts'].append("--rsh=buildah run --")
+                    _tmp_args['rsync_opts'].append('--rsh=' + shlex_quote('%s exec -i' % self._docker_cmd))
+            elif self._remote_transport in BUILDAH:
+                _tmp_args['rsync_opts'].append('--rsh=' + shlex_quote('buildah run --'))
 
         # run the module and store the result
         result.update(self._execute_module('ansible.posix.synchronize', module_args=_tmp_args, task_vars=task_vars))

plugins/modules/acl.py

@@ -67,8 +67,10 @@ options:
     description:
     - Recursively sets the specified ACL.
     - Incompatible with C(state=query).
+    - Alias C(recurse) added in version 1.3.0.
     type: bool
     default: no
+    aliases: [ recurse ]
   use_nfsv4_acls:
     description:
     - Use NFSv4 ACLs instead of POSIX ACLs.
@@ -273,7 +275,7 @@ def main():
             ),
             follow=dict(type='bool', default=True),
             default=dict(type='bool', default=False),
-            recursive=dict(type='bool', default=False),
+            recursive=dict(type='bool', default=False, aliases=['recurse']),
             recalculate_mask=dict(
                 type='str',
                 default='default',

plugins/modules/at.py

@@ -129,7 +129,7 @@ def get_matching_jobs(module, at_cmd, script_file):
 def create_tempfile(command):
     filed, script_file = tempfile.mkstemp(prefix='at')
     fileh = os.fdopen(filed, 'w')
-    fileh.write(command)
+    fileh.write(command + os.linesep)
     fileh.close()
     return script_file
 

plugins/modules/authorized_key.py

@@ -389,13 +389,28 @@ def parsekey(module, raw_key, rank=None):
 
     VALID_SSH2_KEY_TYPES = [
         'sk-ecdsa-sha2-nistp256@openssh.com',
+        'sk-ecdsa-sha2-nistp256-cert-v01@openssh.com',
+        'webauthn-sk-ecdsa-sha2-nistp256@openssh.com',
         'ecdsa-sha2-nistp256',
+        'ecdsa-sha2-nistp256-cert-v01@openssh.com',
         'ecdsa-sha2-nistp384',
+        'ecdsa-sha2-nistp384-cert-v01@openssh.com',
         'ecdsa-sha2-nistp521',
+        'ecdsa-sha2-nistp521-cert-v01@openssh.com',
         'sk-ssh-ed25519@openssh.com',
+        'sk-ssh-ed25519-cert-v01@openssh.com',
         'ssh-ed25519',
+        'ssh-ed25519-cert-v01@openssh.com',
         'ssh-dss',
         'ssh-rsa',
+        'ssh-xmss@openssh.com',
+        'ssh-xmss-cert-v01@openssh.com',
+        'rsa-sha2-256',
+        'rsa-sha2-512',
+        'ssh-rsa-cert-v01@openssh.com',
+        'rsa-sha2-256-cert-v01@openssh.com',
+        'rsa-sha2-512-cert-v01@openssh.com',
+        'ssh-dss-cert-v01@openssh.com',
     ]
 
     options = None   # connection options
@@ -648,11 +663,11 @@ def main():
     module = AnsibleModule(
         argument_spec=dict(
             user=dict(type='str', required=True),
-            key=dict(type='str', required=True),
+            key=dict(type='str', required=True, no_log=False),
             path=dict(type='path'),
             manage_dir=dict(type='bool', default=True),
             state=dict(type='str', default='present', choices=['absent', 'present']),
-            key_options=dict(type='str'),
+            key_options=dict(type='str', no_log=False),
             exclusive=dict(type='bool', default=False),
             comment=dict(type='str'),
             validate_certs=dict(type='bool', default=True),

plugins/modules/firewalld.py

@@ -81,7 +81,7 @@ options:
   permanent:
     description:
       - Should this configuration be in the running firewalld configuration or persist across reboots.
-      - As of Ansible 2.3, permanent operations can operate on firewalld configs when it is not running (requires firewalld >= 3.0.9).
+      - As of Ansible 2.3, permanent operations can operate on firewalld configs when it is not running (requires firewalld >= 0.3.9).
       - Note that if this is C(no), immediate is assumed C(yes).
     type: bool
   immediate:
@@ -99,7 +99,7 @@ options:
     choices: [ absent, disabled, enabled, present ]
   timeout:
     description:
-      - The amount of time the rule should be in effect for when non-permanent.
+      - The amount of time in seconds the rule should be in effect for when non-permanent.
     type: int
     default: 0
   masquerade:
@@ -114,7 +114,7 @@ options:
     description:
       - firewalld Zone target
       - If state is set to C(absent), this will reset the target to default
-    choices: [ default, ACCEPT, DROP, REJECT ]
+    choices: [ default, ACCEPT, DROP, "%%REJECT%%" ]
     type: str
     version_added: 1.2.0
 notes:
@@ -393,26 +393,14 @@ class PortTransaction(FirewallTransaction):
         )
 
     def get_enabled_immediate(self, port, protocol, timeout):
-        port_proto = [port, protocol]
         if self.fw_offline:
-            fw_zone, fw_settings = self.get_fw_zone_settings()
-            ports_list = fw_settings.getPorts()
-        else:
-            ports_list = self.fw.getPorts(self.zone)
-
-        if port_proto in ports_list:
-            return True
-        else:
-            return False
+            dummy, fw_settings = self.get_fw_zone_settings()
+            return fw_settings.queryPort(port=port, protocol=protocol)
+        return self.fw.queryPort(zone=self.zone, port=port, protocol=protocol)
 
     def get_enabled_permanent(self, port, protocol, timeout):
-        port_proto = (port, protocol)
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-
-        if port_proto in fw_settings.getPorts():
-            return True
-        else:
-            return False
+        dummy, fw_settings = self.get_fw_zone_settings()
+        return fw_settings.queryPort(port=port, protocol=protocol)
 
     def set_enabled_immediate(self, port, protocol, timeout):
         self.fw.addPort(self.zone, port, protocol, timeout)
@@ -715,26 +703,14 @@ class ForwardPortTransaction(FirewallTransaction):
         )
 
     def get_enabled_immediate(self, port, proto, toport, toaddr, timeout):
-        forward_port = [port, proto, toport, toaddr]
         if self.fw_offline:
-            fw_zone, fw_settings = self.get_fw_zone_settings()
-            forward_list = fw_settings.getForwardPorts()
-        else:
-            forward_list = self.fw.getForwardPorts(self.zone)
-
-        if forward_port in forward_list:
-            return True
-        else:
-            return False
+            dummy, fw_settings = self.get_fw_zone_settings()
+            return fw_settings.queryForwardPort(port=port, protocol=proto, to_port=toport, to_addr=toaddr)
+        return self.fw.queryForwardPort(port=port, protocol=proto, to_port=toport, to_addr=toaddr)
 
     def get_enabled_permanent(self, port, proto, toport, toaddr, timeout):
-        forward_port = (port, proto, toport, toaddr)
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-
-        if forward_port in fw_settings.getForwardPorts():
-            return True
-        else:
-            return False
+        dummy, fw_settings = self.get_fw_zone_settings()
+        return fw_settings.queryForwardPort(port=port, protocol=proto, to_port=toport, to_addr=toaddr)
 
     def set_enabled_immediate(self, port, proto, toport, toaddr, timeout):
         self.fw.addForwardPort(self.zone, port, proto, toport, toaddr, timeout)
@@ -772,7 +748,7 @@ def main():
             interface=dict(type='str'),
             masquerade=dict(type='str'),
             offline=dict(type='bool'),
-            target=dict(type='str', choices=['default', 'ACCEPT', 'DROP', 'REJECT']),
+            target=dict(type='str', choices=['default', 'ACCEPT', 'DROP', '%%REJECT%%']),
         ),
         supports_check_mode=True,
         required_by=dict(

plugins/modules/firewalld_info.py

@@ -0,0 +1,391 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2021, Hideki Saito <saito@fgrep.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+DOCUMENTATION = r'''
+---
+module: firewalld_info
+short_description: Gather information about firewalld
+description:
+    - This module gathers information about firewalld rules.
+options:
+    active_zones:
+        description: Gather information about active zones.
+        type: bool
+        default: no
+    zones:
+        description:
+            - Gather information about specific zones.
+            - If only works if C(active_zones) is set to C(false).
+        required: false
+        type: list
+        elements: str
+requirements:
+    - firewalld >= 0.2.11
+    - python-firewall
+    - python-dbus
+author:
+    - Hideki Saito (@saito-hideki)
+'''
+
+EXAMPLES = r'''
+- name: Gather information about active zones
+  ansible.posix.firewalld_info:
+    active_zones: yes
+
+- name: Gather information about specific zones
+  ansible.posix.firewalld_info:
+    zones:
+      - public
+      - external
+      - internal
+'''
+
+RETURN = r'''
+active_zones:
+    description:
+      - Gather active zones only if turn it C(true).
+    returned: success
+    type: bool
+    sample: false
+collected_zones:
+    description:
+      - A list of collected zones.
+    returned: success
+    type: list
+    sample: [external, internal]
+undefined_zones:
+    description:
+      - A list of undefined zones in C(zones) option.
+      - C(undefined_zones) will be ignored for gathering process.
+    returned: success
+    type: list
+    sample: [foo, bar]
+firewalld_info:
+    description:
+      - Returns various information about firewalld configuration.
+    returned: success
+    type: complex
+    contains:
+        version:
+            description:
+              - The version information of firewalld.
+            returned: success
+            type: str
+            sample: 0.8.2
+        default_zones:
+            description:
+              - The zone name of default zone.
+            returned: success
+            type: str
+            sample: public
+        zones:
+            description:
+              - A dict of zones to gather information.
+            returned: success
+            type: complex
+            contains:
+                zone:
+                    description:
+                      - The zone name registered in firewalld.
+                    returned: success
+                    type: complex
+                    sample: external
+                    contains:
+                        target:
+                            description:
+                              - A list of services in the zone.
+                            returned: success
+                            type: str
+                            sample: ACCEPT
+                        icmp_block_inversion:
+                            description:
+                              - The ICMP block inversion to block
+                                all ICMP requests.
+                            returned: success
+                            type: bool
+                            sample: false
+                        interfaces:
+                            description:
+                              - A list of network interfaces.
+                            returned: success
+                            type: list
+                            sample:
+                              - 'eth0'
+                              - 'eth1'
+                        sources:
+                            description:
+                              - A list of source network address.
+                            returned: success
+                            type: list
+                            sample:
+                              - '172.16.30.0/24'
+                              - '172.16.31.0/24'
+                        services:
+                            description:
+                              - A list of network services.
+                            returned: success
+                            type: list
+                            sample:
+                              - 'dhcp'
+                              - 'dns'
+                              - 'ssh'
+                        ports:
+                            description:
+                              - A list of network port with protocol.
+                            returned: success
+                            type: list
+                            sample:
+                              - - "22"
+                                - "tcp"
+                              - - "80"
+                                - "tcp"
+                        protocols:
+                            description:
+                              - A list of network protocol.
+                            returned: success
+                            type: list
+                            sample:
+                              - "icmp"
+                              - "ipv6-icmp"
+                        forward:
+                            description:
+                              - The network interface forwarding.
+                              - This parameter supports on python-firewall
+                                0.9.0(or later) and is not collected in earlier
+                                versions.
+                            returned: success
+                            type: bool
+                            sample: false
+                        masquerade:
+                            description:
+                              - The network interface masquerading.
+                            returned: success
+                            type: bool
+                            sample: false
+                        forward_ports:
+                            description:
+                              - A list of forwarding port pair with protocol.
+                            returned: success
+                            type: list
+                            sample:
+                              - "icmp"
+                              - "ipv6-icmp"
+                        source_ports:
+                            description:
+                              - A list of network source port with protocol.
+                            returned: success
+                            type: list
+                            sample:
+                              - - "30000"
+                                - "tcp"
+                              - - "30001"
+                                - "tcp"
+                        icmp_blocks:
+                            description:
+                              - A list of blocking icmp protocol.
+                            returned: success
+                            type: list
+                            sample:
+                              - "echo-request"
+                        rich_rules:
+                            description:
+                              - A list of rich language rule.
+                            returned: success
+                            type: list
+                            sample:
+                              - "rule protocol value=\"icmp\" reject"
+                              - "rule priority=\"32767\" reject"
+'''
+
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib
+from ansible.module_utils._text import to_native
+from distutils.version import StrictVersion
+
+
+try:
+    import dbus
+    HAS_DBUS = True
+except ImportError:
+    HAS_DBUS = False
+
+try:
+    import firewall.client as fw_client
+    import firewall.config as fw_config
+    HAS_FIREWALLD = True
+except ImportError:
+    HAS_FIREWALLD = False
+
+
+def get_version():
+    return fw_config.VERSION
+
+
+def get_active_zones(client):
+    return client.getActiveZones().keys()
+
+
+def get_all_zones(client):
+    return client.getZones()
+
+
+def get_default_zone(client):
+    return client.getDefaultZone()
+
+
+def get_zone_settings(client, zone):
+    return client.getZoneSettings(zone)
+
+
+def get_zone_target(zone_settings):
+    return zone_settings.getTarget()
+
+
+def get_zone_icmp_block_inversion(zone_settings):
+    return zone_settings.getIcmpBlockInversion()
+
+
+def get_zone_interfaces(zone_settings):
+    return zone_settings.getInterfaces()
+
+
+def get_zone_sources(zone_settings):
+    return zone_settings.getSources()
+
+
+def get_zone_services(zone_settings):
+    return zone_settings.getServices()
+
+
+def get_zone_ports(zone_settings):
+    return zone_settings.getPorts()
+
+
+def get_zone_protocols(zone_settings):
+    return zone_settings.getProtocols()
+
+
+# This function supports python-firewall 0.9.0(or later).
+def get_zone_forward(zone_settings):
+    return zone_settings.getForward()
+
+
+def get_zone_masquerade(zone_settings):
+    return zone_settings.getMasquerade()
+
+
+def get_zone_forward_ports(zone_settings):
+    return zone_settings.getForwardPorts()
+
+
+def get_zone_source_ports(zone_settings):
+    return zone_settings.getSourcePorts()
+
+
+def get_zone_icmp_blocks(zone_settings):
+    return zone_settings.getIcmpBlocks()
+
+
+def get_zone_rich_rules(zone_settings):
+    return zone_settings.getRichRules()
+
+
+def main():
+    module_args = dict(
+        active_zones=dict(required=False, type='bool', default=False),
+        zones=dict(required=False, type='list', elements='str'),
+    )
+
+    module = AnsibleModule(
+        argument_spec=module_args,
+        supports_check_mode=True,
+    )
+
+    firewalld_info = dict()
+    result = dict(
+        changed=False,
+        active_zones=module.params['active_zones'],
+        collected_zones=list(),
+        undefined_zones=list(),
+        warnings=list(),
+    )
+
+    # Exit with failure message if requirements modules are not installed.
+    if not HAS_DBUS:
+        module.fail_json(msg=missing_required_lib('python-dbus'))
+    if not HAS_FIREWALLD:
+        module.fail_json(msg=missing_required_lib('python-firewall'))
+
+    # If you want to show warning messages in the task running process,
+    # you can append the message to the 'warn' list.
+    warn = list()
+
+    try:
+        client = fw_client.FirewallClient()
+
+        # Gather general information of firewalld.
+        firewalld_info['version'] = get_version()
+        firewalld_info['default_zone'] = get_default_zone(client)
+
+        # Gather information for zones.
+        zones_info = dict()
+        collect_zones = list()
+        ignore_zones = list()
+        if module.params['active_zones']:
+            collect_zones = get_active_zones(client)
+        elif module.params['zones']:
+            all_zones = get_all_zones(client)
+            specified_zones = module.params['zones']
+            collect_zones = list(set(specified_zones) & set(all_zones))
+            ignore_zones = list(set(specified_zones) - set(collect_zones))
+            warn.append(
+                'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
+        else:
+            collect_zones = get_all_zones(client)
+
+        for zone in collect_zones:
+            # Gather settings for each zone based on the output of
+            # 'firewall-cmd --info-zone=<ZONE>' command.
+            zone_info = dict()
+            zone_settings = get_zone_settings(client, zone)
+            zone_info['target'] = get_zone_target(zone_settings)
+            zone_info['icmp_block_inversion'] = get_zone_icmp_block_inversion(zone_settings)
+            zone_info['interfaces'] = get_zone_interfaces(zone_settings)
+            zone_info['sources'] = get_zone_sources(zone_settings)
+            zone_info['services'] = get_zone_services(zone_settings)
+            zone_info['ports'] = get_zone_ports(zone_settings)
+            zone_info['protocols'] = get_zone_protocols(zone_settings)
+            zone_info['masquerade'] = get_zone_masquerade(zone_settings)
+            zone_info['forward_ports'] = get_zone_forward_ports(zone_settings)
+            zone_info['source_ports'] = get_zone_source_ports(zone_settings)
+            zone_info['icmp_blocks'] = get_zone_icmp_blocks(zone_settings)
+            zone_info['rich_rules'] = get_zone_rich_rules(zone_settings)
+
+            # The 'forward' parameter supports on python-firewall 0.9.0(or later).
+            if StrictVersion(firewalld_info['version']) >= StrictVersion('0.9.0'):
+                zone_info['forward'] = get_zone_forward(zone_settings)
+
+            zones_info[zone] = zone_info
+        firewalld_info['zones'] = zones_info
+    except AttributeError as e:
+        module.fail_json(msg=('firewalld probably not be running, Or the following method '
+                              'is not supported with your python-firewall version. (Error: %s)') % to_native(e))
+    except dbus.exceptions.DBusException as e:
+        module.fail_json(msg=('Unable to gather firewalld settings.'
+                              ' You may need to run as the root user or'
+                              ' use become. (Error: %s)' % to_native(e)))
+
+    result['collected_zones'] = collect_zones
+    result['undefined_zones'] = ignore_zones
+    result['firewalld_info'] = firewalld_info
+    result['warnings'] = warn
+    module.exit_json(**result)
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/mount.py

@@ -93,7 +93,13 @@ options:
   boot:
     description:
       - Determines if the filesystem should be mounted on boot.
-      - Only applies to Solaris systems.
+      - Only applies to Solaris and Linux systems.
+      - For Solaris systems, C(true) will set C(yes) as the value of mount at boot
+        in I(/etc/vfstab).
+      - For Linux, FreeBSD, NetBSD and OpenBSD systems, C(false) will add C(noauto)
+        to mount options in I(/etc/fstab).
+      - To avoid mount option conflicts, if C(noauto) specified in C(opts),
+        mount module will ignore C(boot).
     type: bool
     default: yes
   backup:
@@ -169,8 +175,16 @@ EXAMPLES = r'''
     opts: rw,sync,hard,intr
     state: mounted
     fstype: nfs
-'''
 
+- name: Mount NFS volumes with noauto according to boot option
+  ansible.posix.mount:
+    src: 192.168.1.100:/nfs/ssd/shared_data
+    path: /mnt/shared_data
+    opts: rw,sync,hard,intr
+    boot: no
+    state: mounted
+    fstype: nfs
+'''
 
 import errno
 import os
@@ -180,11 +194,15 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
 from ansible.module_utils.six import iteritems
 from ansible.module_utils._text import to_bytes, to_native
+from ansible.module_utils.parsing.convert_bool import boolean
 
 
 def write_fstab(module, lines, path):
+
     if module.params['backup']:
-        module.backup_local(path)
+        backup_file = module.backup_local(path)
+    else:
+        backup_file = ""
 
     fs_w = open(path, 'w')
 
@@ -194,6 +212,8 @@ def write_fstab(module, lines, path):
     fs_w.flush()
     fs_w.close()
 
+    return backup_file
+
 
 def _escape_fstab(v):
     """Escape invalid characters in fstab fields.
@@ -226,7 +246,7 @@ def _set_mount_save_old(module, args):
     old_lines = []
     exists = False
     changed = False
-    escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args)])
+    escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args) if k != 'warnings'])
     new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
 
     if platform.system() == 'SunOS':
@@ -316,7 +336,7 @@ def _set_mount_save_old(module, args):
         changed = True
 
     if changed and not module.check_mode:
-        write_fstab(module, to_write, args['fstab'])
+        args['backup_file'] = write_fstab(module, to_write, args['fstab'])
 
     return (args['name'], old_lines, changed)
 
@@ -648,7 +668,7 @@ def main():
             fstype=dict(type='str'),
             path=dict(type='path', required=True, aliases=['name']),
             opts=dict(type='str'),
-            passno=dict(type='str'),
+            passno=dict(type='str', no_log=False),
             src=dict(type='path'),
             backup=dict(type='bool', default=False),
             state=dict(type='str', required=True, choices=['absent', 'mounted', 'present', 'unmounted', 'remounted']),
@@ -672,7 +692,8 @@ def main():
             opts='-',
             passno='-',
             fstab=module.params['fstab'],
-            boot='yes'
+            boot='yes' if module.params['boot'] else 'no',
+            warnings=[]
         )
         if args['fstab'] is None:
             args['fstab'] = '/etc/vfstab'
@@ -682,7 +703,9 @@ def main():
             opts='defaults',
             dump='0',
             passno='0',
-            fstab=module.params['fstab']
+            fstab=module.params['fstab'],
+            boot='yes',
+            warnings=[]
         )
         if args['fstab'] is None:
             args['fstab'] = '/etc/fstab'
@@ -691,6 +714,7 @@ def main():
         if platform.system() == 'FreeBSD':
             args['opts'] = 'rw'
 
+    args['backup_file'] = ""
     linux_mounts = []
 
     # Cache all mounts here in order we have consistent results if we need to
@@ -699,14 +723,27 @@ def main():
         linux_mounts = get_linux_mounts(module)
 
         if linux_mounts is None:
-            args['warnings'] = (
-                'Cannot open file /proc/self/mountinfo. '
-                'Bind mounts might be misinterpreted.')
+            args['warnings'].append('Cannot open file /proc/self/mountinfo.'
+                                    ' Bind mounts might be misinterpreted.')
 
     # Override defaults with user specified params
     for key in ('src', 'fstype', 'passno', 'opts', 'dump', 'fstab'):
         if module.params[key] is not None:
             args[key] = module.params[key]
+    if platform.system().lower() == 'linux' or platform.system().lower().endswith('bsd'):
+        # Linux, FreeBSD, NetBSD and OpenBSD have 'noauto' as mount option to
+        # handle mount on boot.  To avoid mount option conflicts, if 'noauto'
+        # specified in 'opts',  mount module will ignore 'boot'.
+        opts = args['opts'].split(',')
+        if 'noauto' in opts:
+            args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
+        elif not module.params['boot']:
+            args['boot'] = 'no'
+            if 'defaults' in opts:
+                args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'defaults'.")
+            else:
+                opts.append('noauto')
+                args['opts'] = ','.join(opts)
 
     # If fstab file does not exist, we first need to create it. This mainly
     # happens when fstab option is passed to the module.
@@ -834,6 +871,10 @@ def main():
     else:
         module.fail_json(msg='Unexpected position reached')
 
+    # If the managed node is Solaris, convert the boot value type to Boolean
+    #  to match the type of return value with the module argument.
+    if platform.system().lower() == 'sunos':
+        args['boot'] = boolean(args['boot'])
     module.exit_json(changed=changed, **args)
 
 

plugins/modules/synchronize.py

@@ -38,9 +38,8 @@ options:
     description:
       - Port number for ssh on the destination host.
       - Prior to Ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
-      - This parameter defaults to the value of C(ansible_ssh_port) or C(ansible_port),
-        the C(remote_port) config setting or the value from ssh client configuration
-        if none of the former have been set.
+      - This parameter defaults to the value of C(ansible_port), the C(remote_port) config setting
+        or the value from ssh client configuration if none of the former have been set.
     type: int
   mode:
     description:
@@ -74,9 +73,9 @@ options:
     default: no
   delete:
     description:
-      - Delete files in C(dest) that don't exist (after transfer, not before) in the C(src) path.
-      - This option requires C(recursive=yes).
-      - This option ignores excluded files and behaves like the rsync opt --delete-excluded.
+      - Delete files in I(dest) that do not exist (after transfer, not before) in the I(src) path.
+      - This option requires I(recursive=yes).
+      - This option ignores excluded files and behaves like the rsync opt C(--delete-after).
     type: bool
     default: no
   dirs:
@@ -138,7 +137,9 @@ options:
     default: yes
   use_ssh_args:
     description:
-      - Use the ssh_args specified in ansible.cfg. Setting this to `yes` will also make `synchronize` use `ansible_ssh_common_args`.
+      - In Ansible 2.10 and lower, it uses the ssh_args specified in C(ansible.cfg).
+      - In Ansible 2.11 and onwards, when set to C(true), it uses all SSH connection configurations like
+        C(ansible_ssh_args), C(ansible_ssh_common_args), and C(ansible_ssh_extra_args).
     type: bool
     default: no
   ssh_connection_multiplexing:
@@ -178,6 +179,13 @@ options:
     type: list
     default:
     elements: str
+  delay_updates:
+    description:
+      - This option puts the temporary file from each updated file into a holding directory until the end of the transfer,
+        at which time all the files are renamed into place in rapid succession.
+    type: bool
+    default: yes
+    version_added: '1.3.0'
 
 notes:
    - rsync must be installed on both the local and remote host.
@@ -199,8 +207,8 @@ notes:
    - Inspect the verbose output to validate the destination user/host/path are what was expected.
    - To exclude files and directories from being synchronized, you may add C(.rsync-filter) files to the source directory.
    - rsync daemon must be up and running with correct permission when using rsync protocol in source or destination path.
-   - The C(synchronize) module forces `--delay-updates` to avoid leaving a destination in a broken in-between state if the underlying rsync process
-     encounters an error. Those synchronizing large numbers of files that are willing to trade safety for performance should call rsync directly.
+   - The C(synchronize) module enables `--delay-updates` by default to avoid leaving a destination in a broken in-between state if the underlying rsync process
+     encounters an error. Those synchronizing large numbers of files that are willing to trade safety for performance should disable this option.
    - link_destination is subject to the same limitations as the underlying rsync daemon. Hard links are only preserved if the relative subtrees
      of the source and destination are the same. Attempts to hardlink into a directory that is a subdirectory of the source will be prevented.
 seealso:
@@ -408,6 +416,7 @@ def main():
             ssh_connection_multiplexing=dict(type='bool', default=False),
             partial=dict(type='bool', default=False),
             verify_host=dict(type='bool', default=False),
+            delay_updates=dict(type='bool', default=True),
             mode=dict(type='str', default='push', choices=['pull', 'push']),
             link_dest=dict(type='list', elements='str'),
         ),
@@ -449,11 +458,12 @@ def main():
     ssh_connection_multiplexing = module.params['ssh_connection_multiplexing']
     verify_host = module.params['verify_host']
     link_dest = module.params['link_dest']
+    delay_updates = module.params['delay_updates']
 
     if '/' not in rsync:
         rsync = module.get_bin_path(rsync, required=True)
 
-    cmd = [rsync, '--delay-updates', '-F']
+    cmd = [rsync]
     _sshpass_pipe = None
     if rsync_password:
         try:
@@ -464,6 +474,9 @@ def main():
             )
         _sshpass_pipe = os.pipe()
         cmd = ['sshpass', '-d' + to_native(_sshpass_pipe[0], errors='surrogate_or_strict')] + cmd
+    if delay_updates:
+        cmd.append('--delay-updates')
+        cmd.append('-F')
     if compress:
         cmd.append('--compress')
     if rsync_timeout:
@@ -537,10 +550,10 @@ def main():
             ssh_cmd_str = ' '.join(shlex_quote(arg) for arg in ssh_cmd)
             if ssh_args:
                 ssh_cmd_str += ' %s' % ssh_args
-            cmd.append('--rsh=%s' % ssh_cmd_str)
+            cmd.append('--rsh=%s' % shlex_quote(ssh_cmd_str))
 
     if rsync_path:
-        cmd.append('--rsync-path=%s' % rsync_path)
+        cmd.append('--rsync-path=%s' % shlex_quote(rsync_path))
 
     if rsync_opts:
         if '' in rsync_opts:
@@ -566,7 +579,7 @@ def main():
             cmd.append('--link-dest=%s' % link_path)
 
     changed_marker = '<<CHANGED>>'
-    cmd.append('--out-format=' + changed_marker + '%i %n%L')
+    cmd.append('--out-format=%s' % shlex_quote(changed_marker + '%i %n%L'))
 
     # expand the paths
     if '@' not in source:
@@ -590,10 +603,10 @@ def main():
                     raise
 
         (rc, out, err) = module.run_command(
-            cmd, pass_fds=_sshpass_pipe,
+            cmdstr, pass_fds=_sshpass_pipe,
             before_communicate_callback=_write_password_to_pipe)
     else:
-        (rc, out, err) = module.run_command(cmd)
+        (rc, out, err) = module.run_command(cmdstr)
 
     if rc:
         return module.fail_json(msg=err, rc=rc, cmd=cmdstr)

plugins/shell/csh.py

@@ -26,6 +26,10 @@ class ShellModule(ShellBase):
     # Family of shells this has.  Must match the filename without extension
     SHELL_FAMILY = 'csh'
 
+    # commonly used
+    ECHO = 'echo'
+    COMMAND_SEP = ';'
+
     # How to end lines in a python script one-liner
     _SHELL_EMBEDDED_PY_EOL = '\\\n'
     _SHELL_REDIRECT_ALLNULL = '>& /dev/null'

tests/integration/targets/authorized_key/tasks/check_mode.yml

@@ -0,0 +1,34 @@
+# -------------------------------------------------------------
+# check mode
+
+- name: CHECK MODE | copy an existing file in place with comments
+  copy:
+    src: existing_authorized_keys
+    dest: "{{ output_dir | expanduser }}/authorized_keys"
+
+- name: CHECK MODE | add key in check mode to validate return codes
+  authorized_key:
+    user: root
+    key: "{{ multiple_key_different_order_2 }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  check_mode: True
+  register: result
+
+- name: CHECK MODE | assert that authorized_keys return values are consistent
+  assert:
+    that:
+      - 'result.changed == True'
+      - '"user" in result'
+      - '"key" in result'
+
+- name: CHECK MODE | recopy authorized_keys to ensure it was not changed
+  copy:
+    src: existing_authorized_keys
+    dest: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: CHECK MODE | assert that the authorized_keys file was not changed
+  assert:
+    that:
+      - 'result.changed == False'

tests/integration/targets/authorized_key/tasks/comments.yml

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------
+# comments
+
+- name: Add rsa key with existing comment
+  authorized_key:
+    user: root
+    key: "{{ rsa_key_basic }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: Change the comment on an existing key
+  authorized_key:
+    user: root
+    key: "{{ rsa_key_basic }}"
+    comment: user@acme.com
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: get the file content
+  shell: cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
+  changed_when: no
+  register: content
+
+- name: Assert that comment on an existing key was changed
+  assert:
+    that:
+      - "'user@acme.com' in content.stdout"
+
+- name: Set the same key with comment to ensure no changes are reported
+  authorized_key:
+    user: root
+    key: "{{ rsa_key_basic }}"
+    comment: user@acme.com
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: Assert that no changes were made when running again
+  assert:
+    that:
+      - not result.changed
+
+- debug:
+    var: "{{ item }}"
+    verbosity: 1
+  with_items:
+    - result
+    - content

tests/integration/targets/authorized_key/tasks/main.yml

@@ -1,6 +1,6 @@
 # test code for the authorized_key module
-# (c) 2014, James Cammarata <jcammarata@ansible.com>
-
+# - (c) 2014, James Cammarata <jcammarata@ansible.com>
+# - (c) 2021, Hideki Saito <saito@fgrep.org>
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
@@ -16,479 +16,17 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+- name: Setup testing environment
+  import_tasks: setup_steps.yml
 
-# -------------------------------------------------------------
-# Setup steps
+- name: Test for multiple keys handling
+  import_tasks: multiple_keys.yml
 
+- name: Test for ssh-dss key handling
+  import_tasks: ssh_dss.yml
 
-- name: copy an existing file in place with comments
-  copy:
-    src: existing_authorized_keys
-    dest: "{{ output_dir | expanduser }}/authorized_keys"
+- name: Test for check mode
+  import_tasks: check_mode.yml
 
-- name: add multiple keys different order
-  authorized_key:
-    user: root
-    key: "{{ multiple_key_different_order_2 }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: get the file content
-  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
-  changed_when: no
-  register: multiple_keys_existing
-
-- name: assert that the key was added and comments and ordering preserved
-  assert:
-    that:
-      - 'result.changed == True'
-      - '"# I like candy" in multiple_keys_existing.stdout'
-      - '"# I like candy" in multiple_keys_existing.stdout_lines[0]'
-      - '"ssh-rsa DATA_BASIC 1@testing" in multiple_keys_existing.stdout'
-      # The specific index is a little fragile, but I want to verify the line shows up
-      # as the 3rd line in the new entries after the existing entries and comments are preserved
-      - '"ssh-rsa DATA_BASIC 1@testing" in multiple_keys_existing.stdout_lines[7]'
-
-# start afresh
-
-- name: remove file foo.txt
-  file:
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-    state: absent
-
-- name: touch the authorized_keys file
-  file:
-    dest: "{{ output_dir }}/authorized_keys"
-    state: touch
-  register: result
-
-- name: assert that the authorized_keys file was created
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.state == "file"'
-
-- name: add multiple keys
-  authorized_key:
-    user: root
-    key: "{{ multiple_key_base }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-    - 'result.changed == True'
-    - 'result.key == multiple_key_base'
-    - 'result.key_options == None'
-
-- name: add multiple keys different order
-  authorized_key:
-    user: root
-    key: "{{ multiple_key_different_order }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-    - 'result.changed == True'
-    - 'result.key == multiple_key_different_order'
-    - 'result.key_options == None'
-
-- name: add multiple keys exclusive
-  authorized_key:
-    user: root
-    key: "{{ multiple_key_exclusive }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-    exclusive: true
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == multiple_key_exclusive'
-      - 'result.key_options == None'
-
-- name: add multiple keys in different calls
-  authorized_key:
-    user: root
-    key: "ecdsa-sha2-nistp521 ECDSA_DATA 4@testing"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: add multiple keys in different calls
-  authorized_key:
-    user: root
-    key: "ssh-rsa DATA_BASIC 1@testing"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: get the file content
-  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
-  changed_when: no
-  register: multiple_keys_at_a_time
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == false'
-      - 'multiple_keys_at_a_time.stdout  == multiple_key_exclusive.strip()'
-
-- name: add multiple keys comment
-  authorized_key:
-    user: root
-    key: "{{ multiple_keys_comments }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-    exclusive: true
-  register: result
-
-- name: get the file content
-  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
-  changed_when: no
-  register: multiple_keys_comments
-
-- name: assert that the keys exist and comment only lines were not added
-  assert:
-    that:
-      - 'result.changed == False'
-      - 'multiple_keys_comments.stdout == multiple_key_exclusive.strip()'
-      - 'result.key_options == None'
-
-
-
-# -------------------------------------------------------------
-# basic ssh-dss key
-
-- name: add basic ssh-dss key
-  authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_basic'
-      - 'result.key_options == None'
-
-- name: re-add basic ssh-dss key
-  authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with an unquoted option
-
-- name: add ssh-dss key with an unquoted option
-  authorized_key:
-    user: root
-    key: "{{ dss_key_unquoted_option }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_unquoted_option'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with an unquoted option
-  authorized_key:
-    user: root
-    key: "{{ dss_key_unquoted_option }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with a leading command="/bin/foo"
-
-- name: add ssh-dss key with a leading command
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_command'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with a leading command
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with a complex quoted leading command
-# ie. command="/bin/echo foo 'bar baz'"
-
-- name: add ssh-dss key with a complex quoted leading command
-  authorized_key:
-    user: root
-    key: "{{ dss_key_complex_command }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_complex_command'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with a complex quoted leading command
-  authorized_key:
-    user: root
-    key: "{{ dss_key_complex_command }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with a command and a single option, which are
-# in a comma-separated list
-
-- name: add ssh-dss key with a command and a single option
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command_single_option }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_command_single_option'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with a command and a single option
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command_single_option }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with a command and multiple other options
-
-- name: add ssh-dss key with a command and multiple options
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command_multiple_options }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_command_multiple_options'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with a command and multiple options
-  authorized_key:
-    user: root
-    key: "{{ dss_key_command_multiple_options }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# ssh-dss key with multiple trailing parts, which are space-
-# separated and not quoted in any way
-
-- name: add ssh-dss key with trailing parts
-  authorized_key:
-    user: root
-    key: "{{ dss_key_trailing }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_trailing'
-      - 'result.key_options == None'
-
-- name: re-add ssh-dss key with trailing parts
-  authorized_key:
-    user: root
-    key: "{{ dss_key_trailing }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that nothing changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# basic ssh-dss key with mutliple permit-open options
-# https://github.com/ansible/ansible-modules-core/issues/1715
-
-- name: add basic ssh-dss key with multi-opts
-  authorized_key:
-    user: root
-    key: "{{ dss_key_basic }}"
-    key_options: 'no-agent-forwarding,no-X11-forwarding,permitopen="10.9.8.1:8080",permitopen="10.9.8.1:9001"'
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: assert that the key with multi-opts was added
-  assert:
-    that:
-      - 'result.changed == True'
-      - 'result.key == dss_key_basic'
-      - 'result.key_options == "no-agent-forwarding,no-X11-forwarding,permitopen=\"10.9.8.1:8080\",permitopen=\"10.9.8.1:9001\""'
-
-- name: get the file content
-  shell: cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
-  changed_when: no
-  register: content
-
-- name: validate content
-  assert:
-    that:
-      - 'content.stdout == "no-agent-forwarding,no-X11-forwarding,permitopen=\"10.9.8.1:8080\",permitopen=\"10.9.8.1:9001\" ssh-dss DATA_BASIC root@testing"'
-
-# -------------------------------------------------------------
-# check mode
-
-- name: CHECK MODE | copy an existing file in place with comments
-  copy:
-    src: existing_authorized_keys
-    dest: "{{ output_dir | expanduser }}/authorized_keys"
-
-- name: CHECK MODE | add key in check mode to validate return codes
-  authorized_key:
-    user: root
-    key: "{{ multiple_key_different_order_2 }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  check_mode: True
-  register: result
-
-- name: CHECK MODE | assert that authorized_keys return values are consistent
-  assert:
-    that:
-      - 'result.changed == True'
-      - '"user" in result'
-      - '"key" in result'
-
-- name: CHECK MODE | recopy authorized_keys to ensure it was not changed 
-  copy:
-    src: existing_authorized_keys
-    dest: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: CHECK MODE | assert that the authorized_keys file was not changed
-  assert:
-    that:
-      - 'result.changed == False'
-
-# -------------------------------------------------------------
-# comments
-
-- name: Add rsa key with existing comment
-  authorized_key:
-    user: root
-    key: "{{ rsa_key_basic }}"
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: Change the comment on an existing key
-  authorized_key:
-    user: root
-    key: "{{ rsa_key_basic }}"
-    comment: user@acme.com
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: get the file content
-  shell: cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
-  changed_when: no
-  register: content
-
-- name: Assert that comment on an existing key was changed
-  assert:
-    that:
-      - "'user@acme.com' in content.stdout"
-
-- name: Set the same key with comment to ensure no changes are reported
-  authorized_key:
-    user: root
-    key: "{{ rsa_key_basic }}"
-    comment: user@acme.com
-    state: present
-    path: "{{ output_dir | expanduser }}/authorized_keys"
-  register: result
-
-- name: Assert that no changes were made when running again
-  assert:
-    that:
-      - not result.changed
-
-- debug:
-    var: "{{ item }}"
-    verbosity: 1
-  with_items:
-    - result
-    - content
+- name: Test for the management of comments with key
+  import_tasks: comments.yml

tests/integration/targets/authorized_key/tasks/multiple_keys.yml

@@ -0,0 +1,96 @@
+# -------------------------------------------------------------
+# multiple keys
+
+- name: add multiple keys
+  authorized_key:
+    user: root
+    key: "{{ multiple_key_base }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+    - 'result.changed == True'
+    - 'result.key == multiple_key_base'
+    - 'result.key_options == None'
+
+- name: add multiple keys different order
+  authorized_key:
+    user: root
+    key: "{{ multiple_key_different_order }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+    - 'result.changed == True'
+    - 'result.key == multiple_key_different_order'
+    - 'result.key_options == None'
+
+- name: add multiple keys exclusive
+  authorized_key:
+    user: root
+    key: "{{ multiple_key_exclusive }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+    exclusive: true
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == multiple_key_exclusive'
+      - 'result.key_options == None'
+
+- name: add multiple keys in different calls
+  authorized_key:
+    user: root
+    key: "ecdsa-sha2-nistp521 ECDSA_DATA 4@testing"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: add multiple keys in different calls
+  authorized_key:
+    user: root
+    key: "ssh-rsa DATA_BASIC 1@testing"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: get the file content
+  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
+  changed_when: no
+  register: multiple_keys_at_a_time
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == false'
+      - 'multiple_keys_at_a_time.stdout  == multiple_key_exclusive.strip()'
+
+- name: add multiple keys comment
+  authorized_key:
+    user: root
+    key: "{{ multiple_keys_comments }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+    exclusive: true
+  register: result
+
+- name: get the file content
+  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
+  changed_when: no
+  register: multiple_keys_comments
+
+- name: assert that the keys exist and comment only lines were not added
+  assert:
+    that:
+      - 'result.changed == False'
+      - 'multiple_keys_comments.stdout == multiple_key_exclusive.strip()'
+      - 'result.key_options == None'

tests/integration/targets/authorized_key/tasks/setup_steps.yml

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------
+# Setup steps
+
+- name: copy an existing file in place with comments
+  copy:
+    src: existing_authorized_keys
+    dest: "{{ output_dir | expanduser }}/authorized_keys"
+
+- name: add multiple keys different order
+  authorized_key:
+    user: root
+    key: "{{ multiple_key_different_order_2 }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: get the file content
+  shell: cat "{{ output_dir | expanduser }}/authorized_keys"
+  changed_when: no
+  register: multiple_keys_existing
+
+- name: assert that the key was added and comments and ordering preserved
+  assert:
+    that:
+      - 'result.changed == True'
+      - '"# I like candy" in multiple_keys_existing.stdout'
+      - '"# I like candy" in multiple_keys_existing.stdout_lines[0]'
+      - '"ssh-rsa DATA_BASIC 1@testing" in multiple_keys_existing.stdout'
+      # The specific index is a little fragile, but I want to verify the line shows up
+      # as the 3rd line in the new entries after the existing entries and comments are preserved
+      - '"ssh-rsa DATA_BASIC 1@testing" in multiple_keys_existing.stdout_lines[7]'
+
+# start afresh
+
+- name: remove file foo.txt
+  file:
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+    state: absent
+
+- name: touch the authorized_keys file
+  file:
+    dest: "{{ output_dir }}/authorized_keys"
+    state: touch
+  register: result
+
+- name: assert that the authorized_keys file was created
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.state == "file"'

tests/integration/targets/authorized_key/tasks/ssh_dss.yml

@@ -0,0 +1,241 @@
+# -------------------------------------------------------------
+# basic ssh-dss key
+
+- name: add basic ssh-dss key
+  authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_basic'
+      - 'result.key_options == None'
+
+- name: re-add basic ssh-dss key
+  authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with an unquoted option
+
+- name: add ssh-dss key with an unquoted option
+  authorized_key:
+    user: root
+    key: "{{ dss_key_unquoted_option }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_unquoted_option'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with an unquoted option
+  authorized_key:
+    user: root
+    key: "{{ dss_key_unquoted_option }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with a leading command="/bin/foo"
+
+- name: add ssh-dss key with a leading command
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_command'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with a leading command
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with a complex quoted leading command
+# ie. command="/bin/echo foo 'bar baz'"
+
+- name: add ssh-dss key with a complex quoted leading command
+  authorized_key:
+    user: root
+    key: "{{ dss_key_complex_command }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_complex_command'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with a complex quoted leading command
+  authorized_key:
+    user: root
+    key: "{{ dss_key_complex_command }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with a command and a single option, which are
+# in a comma-separated list
+
+- name: add ssh-dss key with a command and a single option
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command_single_option }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_command_single_option'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with a command and a single option
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command_single_option }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with a command and multiple other options
+
+- name: add ssh-dss key with a command and multiple options
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command_multiple_options }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_command_multiple_options'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with a command and multiple options
+  authorized_key:
+    user: root
+    key: "{{ dss_key_command_multiple_options }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# ssh-dss key with multiple trailing parts, which are space-
+# separated and not quoted in any way
+
+- name: add ssh-dss key with trailing parts
+  authorized_key:
+    user: root
+    key: "{{ dss_key_trailing }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_trailing'
+      - 'result.key_options == None'
+
+- name: re-add ssh-dss key with trailing parts
+  authorized_key:
+    user: root
+    key: "{{ dss_key_trailing }}"
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that nothing changed
+  assert:
+    that:
+      - 'result.changed == False'
+
+# -------------------------------------------------------------
+# basic ssh-dss key with mutliple permit-open options
+# https://github.com/ansible/ansible-modules-core/issues/1715
+
+- name: add basic ssh-dss key with multi-opts
+  authorized_key:
+    user: root
+    key: "{{ dss_key_basic }}"
+    key_options: 'no-agent-forwarding,no-X11-forwarding,permitopen="10.9.8.1:8080",permitopen="10.9.8.1:9001"'
+    state: present
+    path: "{{ output_dir | expanduser }}/authorized_keys"
+  register: result
+
+- name: assert that the key with multi-opts was added
+  assert:
+    that:
+      - 'result.changed == True'
+      - 'result.key == dss_key_basic'
+      - 'result.key_options == "no-agent-forwarding,no-X11-forwarding,permitopen=\"10.9.8.1:8080\",permitopen=\"10.9.8.1:9001\""'
+
+- name: get the file content
+  shell: cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
+  changed_when: no
+  register: content
+
+- name: validate content
+  assert:
+    that:
+      - 'content.stdout == "no-agent-forwarding,no-X11-forwarding,permitopen=\"10.9.8.1:8080\",permitopen=\"10.9.8.1:9001\" ssh-dss DATA_BASIC root@testing"'

tests/integration/targets/firewalld/aliases

@@ -1,6 +1,5 @@
 destructive
-shippable/posix/group3
+shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
-disabled  # fixme

tests/integration/targets/firewalld/tasks/main.yml

@@ -1,20 +1,6 @@
 # Test playbook for the firewalld module
 # (c) 2017, Adam Miller <admiller@redhat.com>
-
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 - name: Run firewalld tests
   block:
@@ -29,6 +15,13 @@
       register: check_output
       ignore_errors: true
 
+    - name: Enable dbus-broker daemon
+      service:
+        name: dbus-broker
+        enabled: true
+        state: started
+      when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('34', '=='))
+
     - name: Test Online Operations
       block:
         - name: start firewalld
@@ -54,3 +47,4 @@
   - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('14.04', '=='))
   # Firewalld package on OpenSUSE (15+) require Python 3, so we skip on OpenSUSE running py2 on these newer distros
   - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
+  - not (ansible_facts.distribution == "CentOS" and ansible_distribution_major_version is version('7', '==')) # FIXME

tests/integration/targets/firewalld/tasks/port_forward_test_cases.yml

@@ -1,20 +1,6 @@
 # Test playbook for the firewalld module - port operations
 # (c) 2017, Adam Miller <admiller@redhat.com>
-
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 - name: firewalld port forward test permanent enabled
   firewalld:

tests/integration/targets/firewalld/tasks/port_test_cases.yml

@@ -1,20 +1,63 @@
 # Test playbook for the firewalld module - port operations
 # (c) 2017, Adam Miller <admiller@redhat.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+- name: firewalld port range test permanent enabled
+  firewalld:
+    port: 5500-6950/tcp
+    permanent: true
+    state: enabled
+  register: result
+
+- name: assert firewalld port range test permanent enabled worked
+  assert:
+    that:
+    - result is changed
+
+- name: firewalld port range test permanent enabled rerun (verify not changed)
+  firewalld:
+    port: 5500-6950/tcp
+    permanent: true
+    state: enabled
+  register: result
+
+- name: assert firewalld port range test permanent enabled rerun worked (verify not changed)
+  assert:
+    that:
+    - result is not changed
+
+- name: firewalld port test permanent enabled
+  firewalld:
+    port: 6900/tcp
+    permanent: true
+    state: enabled
+  register: result
+
+- name: assert firewalld port test permanent enabled worked
+  assert:
+    that:
+    - result is changed
+
+- name: firewalld port test permanent enabled
+  firewalld:
+    port: 6900/tcp
+    permanent: true
+    state: enabled
+  register: result
+
+- name: assert firewalld port test permanent enabled worked
+  assert:
+    that:
+    - result is not changed
+
+- name: firewalld port test disabled
+  firewalld:
+    port: "{{ item }}"
+    permanent: true
+    state: disabled
+  loop:
+    - 6900/tcp
+    - 5500-6950/tcp
 
 - name: firewalld port test permanent enabled
   firewalld:

tests/integration/targets/firewalld/tasks/run_all_tests.yml

@@ -1,20 +1,6 @@
 # Test playbook for the firewalld module
 # (c) 2017, Adam Miller <admiller@redhat.com>
-
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 - name: Ensure /run/firewalld exists
   file:
@@ -23,16 +9,12 @@
 
 # firewalld service operation test cases
 - include_tasks: service_test_cases.yml
-  # Skipping on CentOS 8 due to https://github.com/ansible/ansible/issues/64750
-  when: not (ansible_facts.distribution == "CentOS" and ansible_distribution_major_version is version('8', '=='))
 
 # firewalld port operation test cases
 - include_tasks: port_test_cases.yml
-  # Skipping on CentOS 8 due to https://github.com/ansible/ansible/issues/64750
-  when: not (ansible_facts.distribution == "CentOS" and ansible_distribution_major_version is version('8', '=='))
 
 # firewalld source operation test cases
 - import_tasks: source_test_cases.yml
 
 # firewalld zone target operation test cases
-- import_tasks: zone_target_test_cases.yml
+- import_tasks: zone_target_test_cases.yml

tests/integration/targets/firewalld/tasks/zone_target_test_cases.yml

@@ -67,3 +67,55 @@
   assert:
     that:
     - result is not changed
+
+- name: firewalld dmz zone target %%REJECT%%
+  firewalld:
+    zone: dmz
+    permanent: True
+    state: present
+    target: '%%REJECT%%'
+  register: result
+
+- name: assert firewalld dmz zone target %%REJECT%% present worked
+  assert:
+    that:
+    - result is changed
+
+- name: firewalld dmz zone target %%REJECT%% rerun (verify not changed)
+  firewalld:
+    zone: dmz
+    permanent: True
+    state: present
+    target: '%%REJECT%%'
+  register: result
+
+- name: assert firewalld dmz zone target %%REJECT%% present worked (verify not changed)
+  assert:
+    that:
+    - result is not changed
+
+- name: firewalld dmz zone target %%REJECT%% absent
+  firewalld:
+    zone: dmz
+    permanent: True
+    state: absent
+    target: '%%REJECT%%'
+  register: result
+
+- name: assert firewalld dmz zone target %%REJECT%% absent worked
+  assert:
+    that:
+    - result is changed
+
+- name: firewalld dmz zone target %%REJECT%% rerun (verify not changed)
+  firewalld:
+    zone: dmz
+    permanent: True
+    state: absent
+    target: '%%REJECT%%'
+  register: result
+
+- name: assert firewalld dmz zone target %%REJECT%% present worked (verify not changed)
+  assert:
+    that:
+    - result is not changed

tests/integration/targets/firewalld_info/aliases

@@ -0,0 +1,5 @@
+destructive
+shippable/posix/group3
+skip/aix
+skip/freebsd
+skip/osx

tests/integration/targets/firewalld_info/tasks/main.yml

@@ -0,0 +1,52 @@
+# Test playbook for the firewalld_info module
+# (c) 2021, Hideki Saito <saito@fgrep.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# This test is based on the integration test playbook for firewalld module.
+- name: Run firewalld tests
+  block:
+    - name: Ensure firewalld is installed
+      package:
+        name: firewalld
+        state: present
+      # This doesn't work for CentOS 6 because firewalld doesn't exist in CentOS6
+
+    - name: Check to make sure the firewalld python module is available.
+      shell: "{{ansible_python.executable}} -c 'import firewall'"
+      register: check_output_firewall
+      ignore_errors: true
+
+    - name: Check to make sure the dbus python module is available.
+      shell: "{{ansible_python.executable}} -c 'import dbus'"
+      register: check_output_dbus
+      ignore_errors: true
+
+    - name: Test Online Operations
+      block:
+        - name: start firewalld
+          service:
+            name: firewalld
+            state: started
+
+        - import_tasks: run_tests_in_started.yml
+      when:
+        - check_output_firewall.rc == 0
+        - check_output_dbus.rc == 0
+
+    - name: Test Offline Operations
+      block:
+        - name: stop firewalld
+          service:
+            name: firewalld
+            state: stopped
+
+        - import_tasks: run_tests_in_stopped.yml
+      when:
+        - check_output_firewall.rc == 0
+        - check_output_dbus.rc == 0
+
+  when:
+  - ansible_facts.os_family == "RedHat" and ansible_facts.distribution_major_version is version('7', '>=')
+  - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('14.04', '=='))
+  # Firewalld package on OpenSUSE (15+) require Python 3, so we skip on OpenSUSE running py2 on these newer distros
+  - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)

tests/integration/targets/firewalld_info/tasks/run_tests_in_started.yml

@@ -0,0 +1,32 @@
+# Test playbook for the firewalld_info module
+# (c) 2021, Hideki Saito <saito@fgrep.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+- name: Ensure firewalld_info without options
+  firewalld_info:
+  register: result
+
+- name: Assert collected_zones and undefined_zones
+  assert:
+    that:
+      - 'result.collected_zones and not result.undefined_zones'
+
+- name: Ensure firewalld_info with active_zones
+  firewalld_info:
+    active_zones: yes
+  register: result
+
+- name: Assert turn active_zones true
+  assert:
+    that:
+
+- name: Ensure firewalld_zones with zone list
+  firewalld_info:
+    zones:
+      - public
+      - invalid_zone
+  register: result
+
+- name: Assert specified zones
+  assert:
+    that:

tests/integration/targets/firewalld_info/tasks/run_tests_in_stopped.yml

@@ -0,0 +1,40 @@
+# Test playbook for the firewalld_info module
+# (c) 2021, Hideki Saito <saito@fgrep.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+- name: Ensure firewalld_info without options
+  firewalld_info:
+  register: result
+  ignore_errors: yes
+
+- name: Assert firewalld_info fails if firewalld is not running.
+  assert:
+    that:
+      - result.failed
+      - "'firewalld probably not be running,' in result.msg"
+
+- name: Ensure firewalld_info with active_zones
+  firewalld_info:
+    active_zones: yes
+  register: result
+  ignore_errors: yes
+
+- name: Assert firewalld_info with active_zones fails if firewalld is not running.
+  assert:
+    that:
+      - result.failed
+      - "'firewalld probably not be running,' in result.msg"
+
+- name: Ensure firewalld_zones with zone list
+  firewalld_info:
+    zones:
+      - public
+      - invalid_zone
+  register: result
+  ignore_errors: yes
+
+- name: Assert firewalld_info with zones list fails if firewalld is not running.
+  assert:
+    that:
+      - result.failed
+      - "'firewalld probably not be running,' in result.msg"

tests/integration/targets/mount/tasks/main.yml

@@ -2,10 +2,12 @@
   file:
     state: directory
     path: '{{ output_dir }}/mount_dest'
+
 - name: Create a directory to bind mount
   file:
     state: directory
     path: '{{ output_dir }}/mount_source'
+
 - name: Put something in the directory so we see that it worked
   copy:
     content: 'Testing
@@ -13,6 +15,7 @@
       '
     dest: '{{ output_dir }}/mount_source/test_file'
   register: orig_info
+
 - name: Bind mount a filesystem (Linux)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -22,6 +25,7 @@
     opts: bind
   when: ansible_system == 'Linux'
   register: bind_result_linux
+
 - name: Bind mount a filesystem (FreeBSD)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -30,11 +34,13 @@
     fstype: nullfs
   when: ansible_system == 'FreeBSD'
   register: bind_result_freebsd
+
 - name: get checksum for bind mounted file
   stat:
     path: '{{ output_dir }}/mount_dest/test_file'
   when: ansible_system in ('FreeBSD', 'Linux')
   register: dest_stat
+
 - name: assert the bind mount was successful
   assert:
     that:
@@ -42,6 +48,7 @@
     - dest_stat['stat']['exists']
     - orig_info['checksum'] == dest_stat['stat']['checksum']
   when: ansible_system in ('FreeBSD', 'Linux')
+
 - name: Bind mount a filesystem (Linux)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -51,6 +58,7 @@
     opts: bind
   when: ansible_system == 'Linux'
   register: bind_result_linux
+
 - name: Bind mount a filesystem (FreeBSD)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -59,11 +67,13 @@
     fstype: nullfs
   when: ansible_system == 'FreeBSD'
   register: bind_result_freebsd
+
 - name: Make sure we didn't mount a second time
   assert:
     that:
     - (ansible_system == 'Linux' and not bind_result_linux['changed']) or (ansible_system == 'FreeBSD' and not bind_result_freebsd['changed'])
   when: ansible_system in ('FreeBSD', 'Linux')
+
 - name: Remount filesystem with different opts (Linux)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -73,6 +83,7 @@
     opts: bind,ro
   when: ansible_system == 'Linux'
   register: bind_result_linux
+
 - name: Remount filesystem with different opts (FreeBSD)
   mount:
     src: '{{ output_dir }}/mount_source'
@@ -82,9 +93,11 @@
     opts: ro
   when: ansible_system == 'FreeBSD'
   register: bind_result_freebsd
+
 - name: Get mount options
   shell: mount | grep mount_dest | grep -E -w '(ro|read-only)' | wc -l
   register: remount_options
+
 - name: Make sure the filesystem now has the new opts
   assert:
     that:
@@ -92,192 +105,213 @@
     - '''1'' in remount_options.stdout'
     - 1 == remount_options.stdout_lines | length
   when: ansible_system in ('FreeBSD', 'Linux')
+
 - name: Unmount the bind mount
   mount:
     name: '{{ output_dir }}/mount_dest'
     state: absent
   when: ansible_system in ('Linux', 'FreeBSD')
   register: unmount_result
+
 - name: Make sure the file no longer exists in dest
   stat:
     path: '{{ output_dir }}/mount_dest/test_file'
   when: ansible_system in ('FreeBSD', 'Linux')
   register: dest_stat
+
 - name: Check that we unmounted
   assert:
     that:
     - unmount_result['changed']
     - not dest_stat['stat']['exists']
   when: ansible_system in ('FreeBSD', 'Linux')
-- name: Create fstab record for the first swap file
-  mount:
-    name: none
-    src: /tmp/swap1
-    opts: sw
-    fstype: swap
-    state: present
-  register: swap1_created
-  when: ansible_system in ('Linux')
-- name: Try to create fstab record for the first swap file again
-  mount:
-    name: none
-    src: /tmp/swap1
-    opts: sw
-    fstype: swap
-    state: present
-  register: swap1_created_again
-  when: ansible_system in ('Linux')
-- name: Check that we created the swap1 record
-  assert:
-    that:
-    - swap1_created['changed']
-    - not swap1_created_again['changed']
-  when: ansible_system in ('Linux')
-- name: Create fstab record for the second swap file
-  mount:
-    name: none
-    src: /tmp/swap2
-    opts: sw
-    fstype: swap
-    state: present
-  register: swap2_created
-  when: ansible_system in ('Linux')
-- name: Try to create fstab record for the second swap file again
-  mount:
-    name: none
-    src: /tmp/swap1
-    opts: sw
-    fstype: swap
-    state: present
-  register: swap2_created_again
-  when: ansible_system in ('Linux')
-- name: Check that we created the swap2 record
-  assert:
-    that:
-    - swap2_created['changed']
-    - not swap2_created_again['changed']
-  when: ansible_system in ('Linux')
-- name: Remove the fstab record for the first swap file
-  mount:
-    name: none
-    src: /tmp/swap1
-    state: absent
-  register: swap1_removed
-  when: ansible_system in ('Linux')
-- name: Try to remove the fstab record for the first swap file again
-  mount:
-    name: none
-    src: /tmp/swap1
-    state: absent
-  register: swap1_removed_again
-  when: ansible_system in ('Linux')
-- name: Check that we removed the swap1 record
-  assert:
-    that:
-    - swap1_removed['changed']
-    - not swap1_removed_again['changed']
-  when: ansible_system in ('Linux')
-- name: Remove the fstab record for the second swap file
-  mount:
-    name: none
-    src: /tmp/swap2
-    state: absent
-  register: swap2_removed
-  when: ansible_system in ('Linux')
-- name: Try to remove the fstab record for the second swap file again
-  mount:
-    name: none
-    src: /tmp/swap2
-    state: absent
-  register: swap2_removed_again
-  when: ansible_system in ('Linux')
-- name: Check that we removed the swap2 record
-  assert:
-    that:
-    - swap2_removed['changed']
-    - not swap2_removed_again['changed']
-  when: ansible_system in ('Linux')
-- name: Create fstab record with missing last two fields
-  copy:
-    dest: /etc/fstab
-    content: '//nas/photo /home/jik/pictures cifs defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev
 
-      '
-  when: ansible_system in ('Linux')
-- name: Try to change the fstab record with the missing last two fields
-  mount:
-    src: //nas/photo
-    path: /home/jik/pictures
-    fstype: cifs
-    opts: defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev,x-systemd.mount-timeout=0
-    state: present
-  register: optional_fields_update
-  when: ansible_system in ('Linux')
-- name: Get the content of the fstab file
-  shell: cat /etc/fstab
-  register: optional_fields_content
-  when: ansible_system in ('Linux')
-- name: Check if the line containing the missing last two fields was changed
-  assert:
-    that:
-    - optional_fields_update['changed']
-    - ''' 0 0'' in optional_fields_content.stdout'
-    - 1 == optional_fields_content.stdout_lines | length
-  when: ansible_system in ('Linux')
 - name: Block to test remounted option
   block:
+  - name: Create fstab record for the first swap file
+    mount:
+      name: none
+      src: /tmp/swap1
+      opts: sw
+      fstype: swap
+      state: present
+    register: swap1_created
+
+  - name: Try to create fstab record for the first swap file again
+    mount:
+      name: none
+      src: /tmp/swap1
+      opts: sw
+      fstype: swap
+      state: present
+    register: swap1_created_again
+
+  - name: Check that we created the swap1 record
+    assert:
+      that:
+      - swap1_created['changed']
+      - not swap1_created_again['changed']
+
+  - name: Create fstab record for the second swap file
+    mount:
+      name: none
+      src: /tmp/swap2
+      opts: sw
+      fstype: swap
+      state: present
+    register: swap2_created
+
+  - name: Try to create fstab record for the second swap file again
+    mount:
+      name: none
+      src: /tmp/swap1
+      opts: sw
+      fstype: swap
+      state: present
+    register: swap2_created_again
+
+  - name: Check that we created the swap2 record
+    assert:
+      that:
+      - swap2_created['changed']
+      - not swap2_created_again['changed']
+
+  - name: Remove the fstab record for the first swap file
+    mount:
+      name: none
+      src: /tmp/swap1
+      state: absent
+    register: swap1_removed
+
+  - name: Try to remove the fstab record for the first swap file again
+    mount:
+      name: none
+      src: /tmp/swap1
+      state: absent
+    register: swap1_removed_again
+
+  - name: Check that we removed the swap1 record
+    assert:
+      that:
+      - swap1_removed['changed']
+      - not swap1_removed_again['changed']
+
+  - name: Remove the fstab record for the second swap file
+    mount:
+      name: none
+      src: /tmp/swap2
+      state: absent
+    register: swap2_removed
+
+  - name: Try to remove the fstab record for the second swap file again
+    mount:
+      name: none
+      src: /tmp/swap2
+      state: absent
+    register: swap2_removed_again
+
+  - name: Check that we removed the swap2 record
+    assert:
+      that:
+      - swap2_removed['changed']
+      - not swap2_removed_again['changed']
+
+  - name: Create fstab record with missing last two fields
+    copy:
+      dest: /etc/fstab
+      content: '//nas/photo /home/jik/pictures cifs defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev
+
+        '
+
+  - name: Try to change the fstab record with the missing last two fields
+    mount:
+      src: //nas/photo
+      path: /home/jik/pictures
+      fstype: cifs
+      opts: defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev,x-systemd.mount-timeout=0
+      state: present
+    register: optional_fields_update
+
+  - name: Get the content of the fstab file
+    shell: cat /etc/fstab
+    register: optional_fields_content
+
+  - name: Check if the line containing the missing last two fields was changed
+    assert:
+      that:
+      - optional_fields_update['changed']
+      - ''' 0 0'' in optional_fields_content.stdout'
+      - 1 == optional_fields_content.stdout_lines | length
+
   - name: Create empty file
-    command: dd if=/dev/zero of=/tmp/myfs.img bs=1048576 count=20
-    when: ansible_system in ('Linux')
+    community.general.filesize:
+      path: /tmp/myfs.img
+      size: 20M
+
   - name: Format FS
-    when: ansible_system in ('Linux')
-    community.general.system.filesystem:
+    community.general.filesystem:
       fstype: ext3
       dev: /tmp/myfs.img
+
   - name: Mount the FS for the first time
     mount:
       path: /tmp/myfs
       src: /tmp/myfs.img
       fstype: ext2
       state: mounted
-    when: ansible_system in ('Linux')
+
   - name: Get the last write time
     shell: 'dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i last write time: |cut -d: -f2-'
     register: last_write_time
-    when: ansible_system in ('Linux')
+
   - name: Wait 2 second
     pause:
       seconds: 2
-    when: ansible_system in ('Linux')
+
   - name: Test if the FS is remounted
     mount:
       path: /tmp/myfs
       state: remounted
-    when: ansible_system in ('Linux')
+
   - name: Get again the last write time
     shell: 'dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i last write time: |cut -d: -f2-'
     register: last_write_time2
-    when: ansible_system in ('Linux')
+
   - name: Fail if they are the same
     fail:
       msg: Filesytem was not remounted, testing of the module failed!
-    when: last_write is defined and last_write_time2 is defined and last_write_time.stdout == last_write_time2.stdout and ansible_system in ('Linux')
+    when: last_write is defined and last_write_time2 is defined and last_write_time.stdout == last_write_time2.stdout 
+
   - name: Remount filesystem with different opts using remounted option (Linux only)
     mount:
       path: /tmp/myfs
       state: remounted
       opts: rw,noexec
-    when: ansible_system == 'Linux'
+
   - name: Get remounted options (Linux only)
     shell: mount | grep myfs | grep -E -w 'noexec' | wc -l
     register: remounted_options
-    when: ansible_system == 'Linux'
+
   - name: Make sure the filesystem now has the new opts after using remounted (Linux only)
     assert:
       that:
         - "'1' in remounted_options.stdout"
         - "1 == remounted_options.stdout_lines | length"
-    when: ansible_system == 'Linux'
+
+  - name: Mount the FS again to test backup
+    mount:
+      path: /tmp/myfs
+      src: /tmp/myfs.img
+      fstype: ext2
+      state: mounted
+      backup: yes
+    register: mount_backup_out
+
+  - name: ensure backup_file in returned output
+    assert:
+      that:
+        - "'backup_file' in mount_backup_out"
+  
   always:
   - name: Umount the test FS
     mount:
@@ -285,7 +319,7 @@
       src: /tmp/myfs.img
       opts: loop
       state: absent
-    when: ansible_system in ('Linux')
+
   - name: Remove the test FS
     file:
       path: '{{ item }}'
@@ -293,4 +327,45 @@
     loop:
     - /tmp/myfs.img
     - /tmp/myfs
-    when: ansible_system in ('Linux')
+  when: ansible_system in ('Linux')
+
+- name: Block to test boot option for Linux
+  block:
+  - name: Create empty file
+    community.general.filesize:
+      path: /tmp/myfs.img
+      size: 20M
+
+  - name: Format FS
+    community.general.filesystem:
+      fstype: ext3
+      dev: /tmp/myfs.img
+
+  - name: Mount the FS with noauto option
+    mount:
+      path: /tmp/myfs
+      src: /tmp/myfs.img
+      fstype: ext3
+      state: mounted
+      boot: no
+      opts: rw,user,async
+    register: mount_info
+
+  - name: assert the mount without noauto was successful
+    assert:
+      that:
+      - mount_info['opts'] == 'rw,user,async,noauto'
+
+  - name: Unmount FS
+    mount:
+      path: /tmp/myfs
+      state: absent
+
+  - name: Remove the test FS
+    file:
+      path: '{{ item }}'
+      state: absent
+    loop:
+    - /tmp/myfs.img
+    - /tmp/myfs
+  when: ansible_system in ('Linux')

tests/integration/targets/setup_pkg_mgr/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+####################################################################
+# WARNING: These are designed specifically for Ansible tests       #
+# and should not be used as examples of how to write Ansible roles #
+####################################################################
+
+- set_fact:
+    pkg_mgr: community.general.pkgng
+    ansible_pkg_mgr: community.general.pkgng
+    cacheable: yes
+  when: ansible_os_family == "FreeBSD"
+
+- set_fact:
+    pkg_mgr: community.general.zypper
+    ansible_pkg_mgr: community.general.zypper
+    cacheable: yes
+  when: ansible_os_family == "Suse"

tests/integration/targets/synchronize/aliases

@@ -1,2 +1 @@
 shippable/posix/group1
-disabled # fixme package

tests/integration/targets/sysctl/tasks/main.yml

@@ -22,7 +22,7 @@
 
 - name: Test inside Docker
   when:
-    - ansible_facts.virtualization_type == 'docker'
+    - ansible_facts.virtualization_type == 'docker' or ansible_facts.virtualization_type == 'container'
   block:
     - set_fact:
         output_dir_test: "{{ output_dir }}/test_sysctl"

tests/sanity/ignore-2.12.txt

@@ -0,0 +1,8 @@
+plugins/modules/synchronize.py pylint:blacklisted-name
+plugins/modules/synchronize.py use-argspec-type-path
+plugins/modules/synchronize.py validate-modules:doc-default-does-not-match-spec
+plugins/modules/synchronize.py validate-modules:nonexistent-parameter-documented
+plugins/modules/synchronize.py validate-modules:parameter-type-not-in-doc
+plugins/modules/synchronize.py validate-modules:undocumented-parameter
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang

tests/unit/plugins/action/fixtures/synchronize/basic/taskvars_in.json

@@ -44,7 +44,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -74,12 +74,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -102,7 +102,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -142,7 +142,7 @@
   "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic/taskvars_out.json

@@ -46,7 +46,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -76,12 +76,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -106,7 +106,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -147,7 +147,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_become/meta.yaml

@@ -25,7 +25,8 @@ asserts:
     - "self.execute_called"
     - "self.final_module_args['_local_rsync_path'] == 'rsync'"
     # this is a crucial aspect of this scenario ...
-    - "self.final_module_args['rsync_path'] == 'sudo rsync'"
+    # note: become_user None -> root
+    - "self.final_module_args['rsync_path'] == 'sudo -u root rsync'"
     - "self.final_module_args['src'] == '/tmp/deleteme'"
     - "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'"
     - "self.task.become == True"

tests/unit/plugins/action/fixtures/synchronize/basic_become/task_vars_in.json

@@ -44,7 +44,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -74,12 +74,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -102,7 +102,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -142,7 +142,7 @@
   "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_become/task_vars_out.json

@@ -46,7 +46,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -76,12 +76,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -106,7 +106,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -147,7 +147,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_become_cli/meta.yaml

@@ -25,7 +25,8 @@ asserts:
     - "self.execute_called"
     - "self.final_module_args['_local_rsync_path'] == 'rsync'"
     # this is a crucial aspect of this scenario ...
-    - "self.final_module_args['rsync_path'] == 'sudo rsync'"
+    # note: become_user None -> root
+    - "self.final_module_args['rsync_path'] == 'sudo -u root rsync'"
     - "self.final_module_args['src'] == '/tmp/deleteme'"
     - "self.final_module_args['dest'] == 'root@el6host:/tmp/deleteme'"
     - "self.task.become == None"

tests/unit/plugins/action/fixtures/synchronize/basic_become_cli/task_vars_in.json

@@ -44,7 +44,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -74,12 +74,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -102,7 +102,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -142,7 +142,7 @@
   "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_become_cli/task_vars_out.json

@@ -46,7 +46,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -76,12 +76,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -106,7 +106,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__b3ac1e6ebeed06f4be0c1edca3dca34036cf7f57", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -147,7 +147,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant/task_vars_in.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -40,15 +40,15 @@
             "default"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -73,7 +73,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -81,7 +81,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -102,15 +102,15 @@
           "default"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -148,14 +148,14 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
   "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant/task_vars_out.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -42,15 +42,15 @@
             "::1"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -75,7 +75,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -83,7 +83,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -106,15 +106,15 @@
           "::1"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__06c4a1b11530cabdf4248804078c1ddacfb88b5e", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -152,7 +152,7 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
@@ -160,7 +160,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant_become_cli/task_vars_in.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -40,15 +40,15 @@
             "default"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -73,7 +73,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -81,7 +81,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -102,15 +102,15 @@
           "default"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -148,14 +148,14 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
   "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant_become_cli/task_vars_out.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -42,15 +42,15 @@
             "::1"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -75,7 +75,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -83,7 +83,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -106,15 +106,15 @@
           "::1"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -152,7 +152,7 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
@@ -160,7 +160,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant_sudo/task_vars_in.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -40,15 +40,15 @@
             "default"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -73,7 +73,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -81,7 +81,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -102,15 +102,15 @@
           "default"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -148,14 +148,14 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
   "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_vagrant_sudo/task_vars_out.json

@@ -8,7 +8,7 @@
   ], 
   "ansible_connection": "ssh", 
   "ansible_ssh_common_args": "", 
-  "ansible_ssh_host": "127.0.0.1", 
+  "ansible_host": "127.0.0.1", 
   "inventory_hostname": "default", 
   "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
   "vars": {
@@ -21,7 +21,7 @@
     "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
     "role_names": [], 
     "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-    "ansible_ssh_host": "127.0.0.1", 
+    "ansible_host": "127.0.0.1", 
     "play_hosts": [
       "default"
     ], 
@@ -42,15 +42,15 @@
             "::1"
           ]
         }, 
-        "ansible_ssh_port": 2202, 
+        "ansible_port": 2202, 
         "inventory_hostname": "default", 
         "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
         "inventory_hostname_short": "default", 
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-        "ansible_ssh_host": "127.0.0.1", 
-        "ansible_ssh_user": "vagrant", 
+        "ansible_host": "127.0.0.1", 
+        "ansible_user": "vagrant", 
         "group_names": [
           "ungrouped"
         ], 
@@ -75,7 +75,7 @@
       "ungrouped"
     ], 
     "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
-    "ansible_ssh_port": 2202, 
+    "ansible_port": 2202, 
     "ansible_version": {
       "major": 2, 
       "full": "2.2.0", 
@@ -83,7 +83,7 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "vagrant"
+    "ansible_user": "vagrant"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
@@ -106,15 +106,15 @@
           "::1"
         ]
       }, 
-      "ansible_ssh_port": 2202, 
+      "ansible_port": 2202, 
       "inventory_hostname": "default", 
       "ansible_ssh_private_key_file": "/home/jtanner/workspace/issues/AP-15905/.vagrant/machines/default/virtualbox/private_key", 
       "inventory_hostname_short": "default", 
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__c360b80aa60ddd99087425dcd3a2094cdd5b8474", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
-      "ansible_ssh_host": "127.0.0.1", 
-      "ansible_ssh_user": "vagrant", 
+      "ansible_host": "127.0.0.1", 
+      "ansible_user": "vagrant", 
       "group_names": [
         "ungrouped"
       ], 
@@ -152,7 +152,7 @@
       "default"
     ]
   }, 
-  "ansible_ssh_port": 2202, 
+  "ansible_port": 2202, 
   "ansible_host": "127.0.0.1", 
   "ansible_shell_executable": "/bin/sh", 
   "inventory_hostname_short": "default", 
@@ -160,7 +160,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905/.vagrant/provisioners/ansible/inventory", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "vagrant", 
+  "ansible_user": "vagrant", 
   "role_names": [], 
   "play_hosts": [
     "default"

tests/unit/plugins/action/fixtures/synchronize/basic_with_private_key/taskvars_in.json

@@ -44,7 +44,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -74,12 +74,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -102,7 +102,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -142,7 +142,7 @@
   "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/basic_with_private_key/taskvars_out.json

@@ -46,7 +46,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -76,12 +76,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "el6host", 
+  "ansible_host": "el6host", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -106,7 +106,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__03600813b83569c710bf5cb2a040d6e01da927c6", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -147,7 +147,7 @@
   "ansible_python_interpreter": "/usr/bin/python", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/delegate_remote/task_vars_in.json

@@ -41,7 +41,7 @@
           "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
           "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
           "environment": [], 
-          "ansible_ssh_user": "root", 
+          "ansible_user": "root", 
           "group_names": [
             "ungrouped"
           ], 
@@ -91,7 +91,7 @@
           "minor": 2, 
           "revision": 0
         }, 
-        "ansible_ssh_user": "root"
+        "ansible_user": "root"
       }
     }, 
     "inventory_hostname_short": "el6host", 
@@ -126,7 +126,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -156,7 +156,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -188,12 +188,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "u1404", 
+  "ansible_host": "u1404", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -218,7 +218,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -248,7 +248,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -284,7 +284,7 @@
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "environment": [], 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_play_hosts": [
           "el6host"
         ], 
@@ -348,7 +348,7 @@
         "minor": 2, 
         "revision": 0
       }, 
-      "ansible_ssh_user": "root"
+      "ansible_user": "root"
     }
   }, 
   "ansible_module_compression": "ZIP_DEFLATED", 
@@ -370,7 +370,7 @@
   "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"

tests/unit/plugins/action/fixtures/synchronize/delegate_remote/task_vars_out.json

@@ -41,7 +41,7 @@
           "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
           "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
           "environment": [], 
-          "ansible_ssh_user": "root", 
+          "ansible_user": "root", 
           "group_names": [
             "ungrouped"
           ], 
@@ -91,7 +91,7 @@
           "minor": 2, 
           "revision": 0
         }, 
-        "ansible_ssh_user": "root"
+        "ansible_user": "root"
       }
     }, 
     "inventory_hostname_short": "el6host", 
@@ -128,7 +128,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -160,7 +160,7 @@
         "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_check_mode": false, 
         "ansible_version": {
           "major": 2, 
@@ -192,12 +192,12 @@
       "minor": 2, 
       "revision": 0
     }, 
-    "ansible_ssh_user": "root"
+    "ansible_user": "root"
   }, 
   "ansible_accelerate_port": 5099, 
   "roledir": null, 
   "ansible_ssh_extra_args": "", 
-  "ansible_ssh_host": "u1404", 
+  "ansible_host": "u1404", 
   "ansible_current_hosts": [
     "el6host"
   ], 
@@ -224,7 +224,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -256,7 +256,7 @@
       "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
       "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
       "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
-      "ansible_ssh_user": "root", 
+      "ansible_user": "root", 
       "ansible_check_mode": false, 
       "ansible_version": {
         "major": 2, 
@@ -292,7 +292,7 @@
         "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
         "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
         "environment": [], 
-        "ansible_ssh_user": "root", 
+        "ansible_user": "root", 
         "ansible_play_hosts": [
           "el6host"
         ], 
@@ -356,7 +356,7 @@
         "minor": 2, 
         "revision": 0
       }, 
-      "ansible_ssh_user": "root"
+      "ansible_user": "root"
     }
   }, 
   "ansible_module_compression": "ZIP_DEFLATED", 
@@ -378,7 +378,7 @@
   "omit": "__omit_place_holder__2433ce0463ffd13b68850ce9cdd98a1cde088e22", 
   "inventory_dir": "/home/jtanner/workspace/issues/AP-15905", 
   "playbook_dir": "/home/jtanner/workspace/issues/AP-15905", 
-  "ansible_ssh_user": "root", 
+  "ansible_user": "root", 
   "role_names": [], 
   "play_hosts": [
     "el6host"