Merge a072f0b2ef into 3514f9d3dc

.azure-pipelines/azure-pipelines.yml

@@ -36,7 +36,7 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:4.0.1
+      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
 
 pool: Standard
 
@@ -51,90 +51,12 @@ stages:
         parameters:
           testFormat: devel/linux/{0}/1
           targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 38
-              test: fedora38
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}/1
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 37
-              test: fedora37
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-  - stage: Docker_2_14
-    displayName: Docker 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.14/linux/{0}/1
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 36
-              test: fedora36
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-  - stage: Docker_2_13
-    displayName: Docker 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/linux/{0}/1
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 34
-              test: fedora34
-            - name: Fedora 35
-              test: fedora35
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-  - stage: Docker_2_12
-    displayName: Docker 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
             - name: CentOS 7
               test: centos7
             - 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
@@ -153,12 +75,20 @@ stages:
               test: centos6
             - name: CentOS 7
               test: centos7
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 32
+              test: fedora32
+            - name: Fedora 33
+              test: fedora33
             - 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_10
     displayName: Docker 2.10
     dependsOn: []
@@ -171,6 +101,12 @@ stages:
               test: centos6
             - name: CentOS 7
               test: centos7
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 30
+              test: fedora30
+            - name: Fedora 31
+              test: fedora31
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -191,6 +127,12 @@ stages:
               test: centos6
             - name: CentOS 7
               test: centos7
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 30
+              test: fedora30
+            - name: Fedora 31
+              test: fedora31
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -208,82 +150,6 @@ stages:
       - template: templates/matrix.yml
         parameters:
           testFormat: devel/{0}/1
-          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.8
-              test: rhel/8.8
-            - name: RHEL 9.2
-              test: rhel/9.2
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}/1
-          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.7
-              test: rhel/8.7
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
-  - stage: Remote_2_14
-    displayName: Remote 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.14/{0}/1
-          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
-            - name: RHEL 9.0
-              test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
-  - stage: Remote_2_13
-    displayName: Remote 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}/1
-          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.5
-              test: rhel/8.5
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/{0}/1
           targets:
             - name: MacOS 11.1
               test: macos/11.1
@@ -291,6 +157,8 @@ stages:
               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
@@ -307,6 +175,10 @@ stages:
               test: rhel/7.9
             - name: RHEL 8.3
               test: rhel/8.3
+            - name: FreeBSD 11.4
+              test: freebsd/11.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
   - stage: Remote_2_10
     displayName: Remote 2.10
     dependsOn: []
@@ -315,10 +187,17 @@ stages:
         parameters:
           testFormat: 2.10/{0}/1
           targets:
-            - name: RHEL 7.9
-              test: rhel/7.9
+            - name: OS X 10.11
+              test: osx/10.11
+            - name: RHEL 7.6
+              test: rhel/7.6
             - name: RHEL 8.2
               test: rhel/8.2
+            - name: FreeBSD 11.1
+              test: freebsd/11.1
+            - name: FreeBSD 12.1
+              test: freebsd/12.1
+
   - stage: Remote_2_9
     displayName: Remote 2.9
     dependsOn: []
@@ -327,11 +206,16 @@ stages:
         parameters:
           testFormat: 2.9/{0}/1
           targets:
-            - name: RHEL 7.9
-              test: rhel/7.9
+            - name: OS X 10.11
+              test: osx/10.11
+            - name: RHEL 7.6
+              test: rhel/7.6
             - name: RHEL 8.1
               test: rhel/8.1
-
+            - name: FreeBSD 11.1
+              test: freebsd/11.1
+            - name: FreeBSD 12.0
+              test: freebsd/12.0
 ## Finally
 
   - stage: Summary
@@ -340,17 +224,9 @@ stages:
       - Remote_2_9
       - Docker_2_9
       - Remote_2_10
-      - Docker_2_10
       - Remote_2_11
+      - Docker_2_10
       - Docker_2_11
-      - Remote_2_12
-      - Docker_2_12
-      - Remote_2_13
-      - Docker_2_13
-      - Remote_2_14
-      - Docker_2_14
-      - Remote_2_15
-      - Docker_2_15
       - Remote_devel
       - Docker_devel
     jobs:

CHANGELOG.rst

@@ -5,96 +5,6 @@ ansible.posix Release Notes
 .. contents:: Topics
 
 
-v1.5.4
-======
-
-Minor Changes
--------------
-
-- json and jsonl - Add the ``ANSIBLE_JSON_INDENT`` parameter
-- json and jsonl - Add the ``path`` attribute into the play and task output
-
-Bugfixes
---------
-
-- Fix sysctl integration test failing on newer versions of core. Previously NoneType was allowable, now it fails to convert to a str type.
-- Support new sanity test for the ansible-core devel branch CI test (https://github.com/ansible-collections/ansible.posix/issues/446).
-- firewall - Fix issue where adding an interface to a zone would fail when the daemon is offline
-- firewall - Fix issue where opening a specific port resulted in opening the whole protocol of the specified port
-- firewalld - Consider value of masquerade and icmp_block_inversion parameters when a boolean like value is passed
-
-v1.5.2
-======
-
-Release Summary
----------------
-
-This is the minor release of the ``ansible.posix`` collection.
-This changelog contains all changes to the modules and plugins
-in this collection that have been added after the release of
-``ansible.posix`` 1.5.1.
-
-Minor Changes
--------------
-
-- Add jsonl callback plugin to ansible.posix collection
-- firewalld - add `protocol` parameter
-
-Bugfixes
---------
-
-- Fixed a bug where firewalld module fails to create/remove zones when the daemon is stopped
-- rhel_facts - Call exit_json with all keyword arguments
-
-v1.5.1
-======
-
-Minor Changes
--------------
-
-- mount - Add ``absent_from_fstab`` state (https://github.com/ansible-collections/ansible.posix/pull/166).
-- mount - Add ``ephemeral`` value for the ``state`` parameter, that allows to mount a filesystem without altering the ``fstab`` file (https://github.com/ansible-collections/ansible.posix/pull/267).
-- r4e_rpm_ostree - new module for validating package state on RHEL for Edge
-- rhel_facts - new facts module to handle RHEL specific facts
-- rhel_rpm_ostree - new module to handle RHEL rpm-ostree specific package management functionality
-- rpm_ostree_upgrade - new module to automate rpm-ostree upgrades
-- rpm_ostree_upgrade - new module to manage upgrades for rpm-ostree based systems
-
-Bugfixes
---------
-
-- Removed contentious terminology to match reference documentation in profile_tasks.
-- firewall - Fixed to output a more complete missing library message.
-- synchronize - Fixed hosts involved in rsync require the same password
-
-v1.4.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.3.0.
-
-Minor Changes
--------------
-
-- firewalld - Show warning message that variable type of ``masquerade`` and ``icmp_block_inversion`` will be changed from ``str`` to ``boolean`` in the future release (https://github.com/ansible-collections/ansible.posix/pull/254).
-- selinux - optionally update kernel boot params when disabling/re-enabling SELinux (https://github.com/ansible-collections/ansible.posix/pull/142).
-
-Bugfixes
---------
-
-- Fix for whitespace in source full path causing error ```code 23) at main.c(1330) [sender=3.2.3]``` (https://github.com/ansible-collections/ansible.posix/pull/278)
-- Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
-- Use vendored version of ``distutils.version`` instead of the deprecated Python standard library to address PEP 632 (https://github.com/ansible-collections/ansible.posix/issues/303).
-- firewalld - Correct usage of queryForwardPort (https://github.com/ansible-collections/ansible.posix/issues/247).
-- firewalld - Refine the handling of exclusive options (https://github.com/ansible-collections/ansible.posix/issues/255).
-- mount - add a newline at the end of line in ``fstab`` (https://github.com/ansible-collections/ansible.posix/issues/210).
-- profile_tasks - Correctly calculate task execution time with serial execution (https://github.com/ansible-collections/ansible.posix/issues/83).
-- seboolean - add ``python3-libsemanage`` package dependency for RHEL8+ systems.
-
 v1.3.0
 ======
 

PSF-license.txt

@@ -1,48 +0,0 @@
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.

README.md

@@ -13,8 +13,6 @@ An Ansible Collection of modules and plugins that target POSIX UNIX/Linux and de
 
 This collection has been tested against following Ansible versions: **>=2.9**.
 
-For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
-fully qualified collection name (for example, `cisco.ios.ios`).
 Plugins and modules within a collection may be tested with only specific Ansible versions.
 A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
@@ -33,9 +31,6 @@ Name | Description
 [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.rhel_facts](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.rhel_facts_module.rst)|Facts module to set or override RHEL specific facts.
-[ansible.posix.rhel_rpm_ostree](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.rhel_rpm_ostree_module.rst)|Ensure packages exist in a RHEL for Edge rpm-ostree based system
-[ansible.posix.rpm_ostree_upgrade](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.rpm_ostree_upgrade_module.rst)|Manage rpm-ostree upgrade transactions
 [ansible.posix.seboolean](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.seboolean_module.rst)|Toggles SELinux booleans
 [ansible.posix.selinux](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.selinux_module.rst)|Change policy and state of SELinux
 [ansible.posix.synchronize](https://github.com/ansible-collections/ansible.posix/blob/main/docs/ansible.posix.synchronize_module.rst)|A wrapper around rsync to make common tasks in your playbooks quick and easy
@@ -91,12 +86,10 @@ None
 
 <!-- List the versions of Ansible the collection has been tested with. Must match what is in galaxy.yml. -->
 
-- ansible-core 2.14 (devel)
-- ansible-core 2.13 (stable)
-- ansible-core 2.12 (stable)
-- ansible-core 2.11 (stable)
-- ansible-base 2.10 (stable)
-- ansible 2.9 (stable)
+* ansible-core 2.12 (devel)
+* ansible-core 2.11 (stable)
+* ansible-base 2.10 (stable)
+* ansible 2.9 (stable)
 
 ## Roadmap
 

bindep.txt

@@ -1,4 +1,4 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see https://docs.openstack.org/infra/bindep/ for additional information.
 
-rsync [platform:redhat]
+rsync [platform:centos-8 platform:rhel-8]

changelogs/changelog.yaml

@@ -210,140 +210,3 @@ releases:
     - synchronize.yml
     - test_matrix.yml
     release_date: '2021-08-11'
-  1.4.0:
-    changes:
-      bugfixes:
-      - Fix for whitespace in source full path causing error ```code 23) at main.c(1330)
-        [sender=3.2.3]``` (https://github.com/ansible-collections/ansible.posix/pull/278)
-      - Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
-      - Use vendored version of ``distutils.version`` instead of the deprecated Python
-        standard library to address PEP 632 (https://github.com/ansible-collections/ansible.posix/issues/303).
-      - firewalld - Correct usage of queryForwardPort (https://github.com/ansible-collections/ansible.posix/issues/247).
-      - firewalld - Refine the handling of exclusive options (https://github.com/ansible-collections/ansible.posix/issues/255).
-      - mount - add a newline at the end of line in ``fstab`` (https://github.com/ansible-collections/ansible.posix/issues/210).
-      - profile_tasks - Correctly calculate task execution time with serial execution
-        (https://github.com/ansible-collections/ansible.posix/issues/83).
-      - seboolean - add ``python3-libsemanage`` package dependency for RHEL8+ systems.
-      minor_changes:
-      - firewalld - Show warning message that variable type of ``masquerade`` and
-        ``icmp_block_inversion`` will be changed from ``str`` to ``boolean`` in the
-        future release (https://github.com/ansible-collections/ansible.posix/pull/254).
-      - selinux - optionally update kernel boot params when disabling/re-enabling
-        SELinux (https://github.com/ansible-collections/ansible.posix/pull/142).
-      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.3.0.'
-    fragments:
-    - 1.4.0.yml
-    - 211_fstab_append_newline.yml
-    - 247_firewalld.yml
-    - 254_variable_warnings.yml
-    - 255_authorized_key_url.yml
-    - 263_profile_tasks_with_serial.yml
-    - 272-copy_ignore_txt.yml
-    - 277_fix_integration_test_on_devel.yml
-    - 282_fix_unit_test_for_synchronize.yml
-    - 287_firewalld_requirements.yml
-    - 288_mounts_options.yml
-    - 297_firewalld_exclusive_options_handling.yml
-    - 299_seboolean_python3.yml
-    - 302_shippable_exit_code.yml
-    - 304_pep632.yml
-    - 346_copy_ignore_txt_for_devel.yml
-    - 347_add_branch_213.yml
-    - 349_follow_new_guidelines.yml
-    - 353_ci_fix_unittest_for_synchronize.yml
-    - disable_selinux_via_kernel_cmdline.yml
-    - psf-license.yml
-    - sanity_fixes.yml
-    - shell_escape_full_path_for_rsync.yml
-    release_date: '2022-05-23'
-  1.5.1:
-    changes:
-      bugfixes:
-      - Removed contentious terminology to match reference documentation in profile_tasks.
-      - firewall - Fixed to output a more complete missing library message.
-      - synchronize - Fixed hosts involved in rsync require the same password
-      minor_changes:
-      - mount - Add ``absent_from_fstab`` state (https://github.com/ansible-collections/ansible.posix/pull/166).
-      - mount - Add ``ephemeral`` value for the ``state`` parameter, that allows to
-        mount a filesystem without altering the ``fstab`` file (https://github.com/ansible-collections/ansible.posix/pull/267).
-      - r4e_rpm_ostree - new module for validating package state on RHEL for Edge
-      - rhel_facts - new facts module to handle RHEL specific facts
-      - rhel_rpm_ostree - new module to handle RHEL rpm-ostree specific package management
-        functionality
-      - rpm_ostree_upgrade - new module to automate rpm-ostree upgrades
-      - rpm_ostree_upgrade - new module to manage upgrades for rpm-ostree based systems
-    fragments:
-    - 166_mount_absent_fstab.yml
-    - 267_mount_ephemeral.yml
-    - 366_update_version_number_for_galaxy.yml
-    - 371_refactoring_ci_process_202206.yml
-    - 373_firewall_fix_missing_library_message.yml
-    - 375_update_azp_container.yml
-    - 380_update_usage_profile_tasks.yml
-    - 386_follow_ci_testing_rules.yml
-    - 389_ci_add_stable_214.yml
-    - 390_hosts_involved_same_password.yml
-    - 393-rpm-ostree.yml
-    - 393_rhel_for_edge.yml
-    - 400-fix-boolean-values-in-docs.yml
-    - 401_document_module_default_values.yml
-    - 407_fix_firewalld_port_test.yml
-    - 409_update_azp_matrix.yml
-    release_date: '2023-01-20'
-  1.5.2:
-    changes:
-      bugfixes:
-      - Fixed a bug where firewalld module fails to create/remove zones when the daemon
-        is stopped
-      - rhel_facts - Call exit_json with all keyword arguments
-      minor_changes:
-      - Add jsonl callback plugin to ansible.posix collection
-      - firewalld - add `protocol` parameter
-      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
-
-        This changelog contains all changes to the modules and plugins
-
-        in this collection that have been added after the release of
-
-        ``ansible.posix`` 1.5.1.'
-    fragments:
-    - 1.5.2.yml
-    - 399_firewalld_create_remove_zone_when_offline.yml
-    - 413-synchronize-seealso.yml
-    - 417-add-protocol-parameter.yml
-    - 419-fix-patch-doc.yml
-    - 425-support_test-sanity-docker-devel.yml
-    - 426-firewalld_info-doc-update.yml
-    - 434-fix-rhel_facts-exit_json.yml
-    - 535-add-jsonl-callback.yml
-    release_date: '2023-04-07'
-  1.5.4:
-    changes:
-      bugfixes:
-      - Fix sysctl integration test failing on newer versions of core. Previously
-        NoneType was allowable, now it fails to convert to a str type.
-      - Support new sanity test for the ansible-core devel branch CI test (https://github.com/ansible-collections/ansible.posix/issues/446).
-      - firewall - Fix issue where adding an interface to a zone would fail when the
-        daemon is offline
-      - firewall - Fix issue where opening a specific port resulted in opening the
-        whole protocol of the specified port
-      - firewalld - Consider value of masquerade and icmp_block_inversion parameters
-        when a boolean like value is passed
-      minor_changes:
-      - json and jsonl - Add the ``ANSIBLE_JSON_INDENT`` parameter
-      - json and jsonl - Add the ``path`` attribute into the play and task output
-    fragments:
-    - 343-fix-profile_tasks-callback-documentation.yml
-    - 402_firewall_fix_offline_interface_add.yml
-    - 404_firewalld_masquerade_icmp_block_inversion_bugfixes.yml
-    - 440-json-add-path-field.yaml
-    - 441-json-add-indent-parameter.yaml
-    - 445_ci_support_stable-215.yml
-    - 448_support_new_sanity_test.yml
-    - 451_firewall_fix_protocol_parameter.yml
-    - 456_sysctl_fix_nonetype.yml
-    release_date: '2023-05-10'

changelogs/fragments/211_fstab_append_newline.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+- mount - add a newline at the end of line in ``fstab`` (https://github.com/ansible-collections/ansible.posix/issues/210).

changelogs/fragments/220_synchronize_add_quiet_option.yml

@@ -1,2 +1,2 @@
 minor_changes:
-- synchronize - add the ``quiet`` option to suppress non-error messages (https://github.com/ansible-collections/ansible.posix/issues/171).
+- synchronize - add the ``quiet`` option to suppress output messages (https://github.com/ansible-collections/ansible.posix/issues/171).

changelogs/fragments/247_firewalld.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+- firewalld - Correct usage of queryForwardPort (https://github.com/ansible-collections/ansible.posix/issues/247).

changelogs/fragments/254_variable_warnings.yml

@@ -0,0 +1,5 @@
+---
+minor_changes:
+- firewalld - Show warning message that variable type of ``masquerade`` and
+  ``icmp_block_inversion`` will be changed from ``str`` to ``boolean``
+  in the future release (https://github.com/ansible-collections/ansible.posix/pull/254).

changelogs/fragments/255_authorized_key_url.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+- authorized_keys - add an example involving ``url`` lookup plugin (https://github.com/ansible-collections/ansible.posix/pull/260).

changelogs/fragments/263_profile_tasks_with_serial.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+- profile_tasks - Correctly calculate task execution time with serial execution (https://github.com/ansible-collections/ansible.posix/issues/83).

changelogs/fragments/272-copy_ignore_txt.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - Copy ignore-2.12.txt to ignore-2.13.txt.

changelogs/fragments/277_fix_integration_test_on_devel.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+- Fix integration tests of synchronize and sysctl to address chaging behavior on devel branch (https://github.com/ansible-collections/overview/issues/45).

changelogs/fragments/282_fix_unit_test_for_synchronize.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+- Fix unit tests of synchronize action plugin to use yaml.safe_load().

changelogs/fragments/466-tests.yml

@@ -1,2 +0,0 @@
-trivial:
-  - "Fix integration tests so they work with ansible-core devel / 2.16 (https://github.com/ansible-collections/ansible.posix/pull/466)."

changelogs/fragments/477_ci_update.yml

@@ -1,3 +0,0 @@
----
-trivial:
-  - "Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD for ansible-core:devel test(https://github.com/ansible-collections/ansible.posix/issues/476)."

changelogs/fragments/487_ci_update.yml

@@ -1,3 +0,0 @@
----
-trivial:
-  - "Drop FreeBSD12.4 from CI for ansible-core:devel(https://github.com/ansible-collections/ansible.posix/issues/486)."

changelogs/fragments/disable_selinux_via_kernel_cmdline.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- selinux - optionally update kernel boot params when disabling/re-enabling SELinux (https://github.com/ansible-collections/ansible.posix/pull/142).

changelogs/fragments/sanity_fixes.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+- sanity fixes for pylint test.

changelogs/fragments/test-reqs.yml

@@ -1,2 +0,0 @@
-trivial:
-  - "Move Galaxy test requirements from old transitional format in tests/requirements.yml to standard Ansible Galaxy requirements files in tests/integration/requirements.yml and tests/unit/requirements.yml."

codecov.yml

@@ -1 +0,0 @@
-comment: false

docs/ansible.posix.acl_module.rst

@@ -49,8 +49,8 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>If the target is a directory, setting this to <code>true</code> will make it the default ACL for entities created inside the directory.</div>
-                        <div>Setting <code>default</code> to <code>true</code> causes an error if the path is a file.</div>
+                        <div>If the target is a directory, setting this to <code>yes</code> will make it the default ACL for entities created inside the directory.</div>
+                        <div>Setting <code>default</code> to <code>yes</code> causes an error if the path is a file.</div>
                 </td>
             </tr>
             <tr>
@@ -63,7 +63,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">""</div>
                 </td>
                 <td>
                         <div>The actual user or group that the ACL applies to when matching entity types user or group are selected.</div>
@@ -286,7 +285,7 @@ Examples
         entity: joe
         etype: user
         permissions: rw
-        default: true
+        default: yes
         state: present
 
     - name: Same as previous but using entry shorthand

docs/ansible.posix.at_module.rst

@@ -171,7 +171,7 @@ Examples
         command: ls -d / >/dev/null
         count: 20
         units: minutes
-        unique: true
+        unique: yes
 
 
 

docs/ansible.posix.authorized_key_module.rst

@@ -139,8 +139,8 @@ Parameters
                 </td>
                 <td>
                         <div>Whether this module should manage the directory of the authorized key file.</div>
-                        <div>If set to <code>true</code>, the module will create the directory, as well as set the owner and permissions of an existing directory.</div>
-                        <div>Be sure to set <code>manage_dir=false</code> if you are using an alternate directory for authorized_keys, as set with <code>path</code>, since you could lock yourself out of SSH access.</div>
+                        <div>If set to <code>yes</code>, the module will create the directory, as well as set the owner and permissions of an existing directory.</div>
+                        <div>Be sure to set <code>manage_dir=no</code> if you are using an alternate directory for authorized_keys, as set with <code>path</code>, since you could lock yourself out of SSH access.</div>
                         <div>See the example below.</div>
                 </td>
             </tr>
@@ -212,9 +212,9 @@ Parameters
                 </td>
                 <td>
                         <div>This only applies if using a https url as the source of the keys.</div>
-                        <div>If set to <code>false</code>, the SSL certificates will not be validated.</div>
-                        <div>This should only set to <code>false</code> used on personally controlled sites using self-signed certificates as it avoids verifying the source site.</div>
-                        <div>Prior to 2.1 the code worked as if this was set to <code>true</code>.</div>
+                        <div>If set to <code>no</code>, the SSL certificates will not be validated.</div>
+                        <div>This should only set to <code>no</code> used on personally controlled sites using self-signed certificates as it avoids verifying the source site.</div>
+                        <div>Prior to 2.1 the code worked as if this was set to <code>yes</code>.</div>
                 </td>
             </tr>
     </table>
@@ -240,19 +240,13 @@ Examples
         state: present
         key: https://github.com/charlie.keys
 
-    - name: Set authorized keys taken from url using lookup
-      ansible.posix.authorized_key:
-        user: charlie
-        state: present
-        key: "{{ lookup('url', 'https://github.com/charlie.keys', split_lines=False) }}"
-
     - name: Set authorized key in alternate location
       ansible.posix.authorized_key:
         user: charlie
         state: present
         key: "{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}"
         path: /etc/ssh/authorized_keys/charlie
-        manage_dir: false
+        manage_dir: False
 
     - name: Set up multiple authorized keys
       ansible.posix.authorized_key:
@@ -275,14 +269,14 @@ Examples
         user: charlie
         state: present
         key: https://github.com/user.keys
-        validate_certs: false
+        validate_certs: False
 
     - name: Set authorized key, removing all the authorized keys already set
       ansible.posix.authorized_key:
         user: root
         key: "{{ lookup('file', 'public_keys/doe-jane') }}"
         state: present
-        exclusive: true
+        exclusive: True
 
     - name: Set authorized key for user ubuntu copying it from current user
       ansible.posix.authorized_key:
@@ -460,7 +454,7 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
                 </td>
                 <td>success</td>
                 <td>
-                            <div>This only applies if using a https url as the source of the keys. If set to <code>false</code>, the SSL certificates will not be validated.</div>
+                            <div>This only applies if using a https url as the source of the keys. If set to <code>no</code>, the SSL certificates will not be validated.</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;">True</div>

docs/ansible.posix.firewalld_info_module.rst

@@ -89,12 +89,7 @@ Examples
 
     - name: Gather information about active zones
       ansible.posix.firewalld_info:
-        active_zones: true
-      register: result
-
-    - name: Print default zone for debugging
-      ansible.builtin.debug:
-        var: result.firewalld_info.default_zone
+        active_zones: yes
 
     - name: Gather information about specific zones
       ansible.posix.firewalld_info:
@@ -102,7 +97,6 @@ Examples
           - public
           - external
           - internal
-      register: result
 
 
 
@@ -169,7 +163,7 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
                     <td class="elbow-placeholder">&nbsp;</td>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>default_zone</b>
+                    <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>

docs/ansible.posix.firewalld_module.rst

@@ -25,7 +25,6 @@ Requirements
 The below requirements are needed on the host that executes this module.
 
 - firewalld >= 0.2.11
-- python-firewall >= 0.2.11
 
 
 Parameters
@@ -155,7 +154,7 @@ Parameters
                 <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;= 0.3.9).</div>
-                        <div>Note that if this is <code>false</code>, immediate is assumed <code>true</code>.</div>
+                        <div>Note that if this is <code>no</code>, immediate is assumed <code>yes</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -262,21 +261,6 @@ Parameters
                 </td>
             </tr>
 
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>protocol</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>Name of a protocol to add/remove to/from firewalld.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -417,7 +401,6 @@ Notes
    - Requires the python2 bindings of firewalld, which may not be installed by default.
    - For distributions where the python2 firewalld bindings are unavailable (e.g Fedora 28 and later) you will have to set the ansible_python_interpreter for these hosts to the python3 interpreter path and install the python3 bindings.
    - Zone transactions (creating, deleting) can be performed by using only the zone and state parameters "present" or "absent". Note that zone transactions must explicitly be permanent. This is a limitation in firewalld. This also means that you will have to reload firewalld after adding a zone that you wish to perform immediate actions on. The module will not take care of this for you implicitly because that would undo any previously performed immediate actions which were not permanent. Therefore, if you require immediate access to a newly created zone it is recommended you reload firewalld immediately after the zone creation returns with a changed state and before you perform any other immediate, non-permanent actions on that zone.
-   - This module needs ``python-firewall`` or ``python3-firewall`` on managed nodes. It is usually provided as a subset with ``firewalld`` from the OS distributor for the OS default Python interpreter.
 
 
 
@@ -429,35 +412,29 @@ Examples
     - name: permit traffic in default zone for https service
       ansible.posix.firewalld:
         service: https
-        permanent: true
-        state: enabled
-
-    - name: permit ospf traffic
-      ansible.posix.firewalld:
-        protocol: ospf
-        permanent: true
+        permanent: yes
         state: enabled
 
     - name: do not permit traffic in default zone on port 8081/tcp
       ansible.posix.firewalld:
         port: 8081/tcp
-        permanent: true
+        permanent: yes
         state: disabled
 
     - ansible.posix.firewalld:
         port: 161-162/udp
-        permanent: true
+        permanent: yes
         state: enabled
 
     - ansible.posix.firewalld:
         zone: dmz
         service: http
-        permanent: true
+        permanent: yes
         state: enabled
 
     - ansible.posix.firewalld:
         rich_rule: rule service name="ftp" audit limit value="1/m" accept
-        permanent: true
+        permanent: yes
         state: enabled
 
     - ansible.posix.firewalld:
@@ -468,44 +445,44 @@ Examples
     - ansible.posix.firewalld:
         zone: trusted
         interface: eth2
-        permanent: true
+        permanent: yes
         state: enabled
 
     - ansible.posix.firewalld:
-        masquerade: true
+        masquerade: yes
         state: enabled
-        permanent: true
+        permanent: yes
         zone: dmz
 
     - ansible.posix.firewalld:
         zone: custom
         state: present
-        permanent: true
+        permanent: yes
 
     - ansible.posix.firewalld:
         zone: drop
         state: enabled
-        permanent: true
-        icmp_block_inversion: true
+        permanent: yes
+        icmp_block_inversion: yes
 
     - ansible.posix.firewalld:
         zone: drop
         state: enabled
-        permanent: true
+        permanent: yes
         icmp_block: echo-request
 
     - ansible.posix.firewalld:
         zone: internal
         state: present
-        permanent: true
+        permanent: yes
         target: ACCEPT
 
     - name: Redirect port 443 to 8443 with Rich Rule
       ansible.posix.firewalld:
         rich_rule: rule family=ipv4 forward-port port=443 protocol=tcp to-port=8443
         zone: public
-        permanent: true
-        immediate: true
+        permanent: yes
+        immediate: yes
         state: enabled
 
 

docs/ansible.posix.mount_module.rst

@@ -73,7 +73,6 @@ Parameters
                         <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>
-                        <div>This parameter is ignored when <em>state</em> is set to <code>ephemeral</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -86,12 +85,12 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">"0"</div>
+                        <b>Default:</b><br/><div style="color: blue">0</div>
                 </td>
                 <td>
                         <div>Dump (see fstab(5)).</div>
                         <div>Note that if set to <code>null</code> and <em>state</em> set to <code>present</code>, it will cease to work and duplicate entries will be made with subsequent runs.</div>
-                        <div>Has no effect on Solaris systems or when used with <code>ephemeral</code>.</div>
+                        <div>Has no effect on Solaris systems.</div>
                 </td>
             </tr>
             <tr>
@@ -111,7 +110,6 @@ Parameters
                         <div>This might be useful if you need to configure mountpoints in a chroot environment.</div>
                         <div>OpenBSD does not allow specifying alternate fstab files with mount so do not use this on OpenBSD with any state that operates on the live filesystem.</div>
                         <div>This parameter defaults to /etc/fstab or /etc/vfstab on Solaris.</div>
-                        <div>This parameter is ignored when <em>state</em> is set to <code>ephemeral</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -127,7 +125,7 @@ Parameters
                 </td>
                 <td>
                         <div>Filesystem type.</div>
-                        <div>Required when <em>state</em> is <code>present</code>, <code>mounted</code> or <code>ephemeral</code>.</div>
+                        <div>Required when <em>state</em> is <code>present</code> or <code>mounted</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -155,12 +153,12 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">"0"</div>
+                        <b>Default:</b><br/><div style="color: blue">0</div>
                 </td>
                 <td>
                         <div>Passno (see fstab(5)).</div>
                         <div>Note that if set to <code>null</code> and <em>state</em> set to <code>present</code>, it will cease to work and duplicate entries will be made with subsequent runs.</div>
-                        <div>Deprecated on Solaris systems. Has no effect when used with <code>ephemeral</code>.</div>
+                        <div>Deprecated on Solaris systems.</div>
                 </td>
             </tr>
             <tr>
@@ -194,7 +192,7 @@ Parameters
                 </td>
                 <td>
                         <div>Device (or NFS volume, or something else) to be mounted on <em>path</em>.</div>
-                        <div>Required when <em>state</em> set to <code>present</code>, <code>mounted</code> or <code>ephemeral</code>.</div>
+                        <div>Required when <em>state</em> set to <code>present</code> or <code>mounted</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -210,22 +208,18 @@ Parameters
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
                                     <li>absent</li>
-                                    <li>absent_from_fstab</li>
                                     <li>mounted</li>
                                     <li>present</li>
                                     <li>unmounted</li>
                                     <li>remounted</li>
-                                    <li>ephemeral</li>
                         </ul>
                 </td>
                 <td>
                         <div>If <code>mounted</code>, the device will be actively mounted and appropriately configured in <em>fstab</em>. If the mount point is not present, the mount point will be created.</div>
                         <div>If <code>unmounted</code>, the device will be unmounted without changing <em>fstab</em>.</div>
                         <div><code>present</code> only specifies that the device is to be configured in <em>fstab</em> and does not trigger or require a mount.</div>
-                        <div><code>ephemeral</code> only specifies that the device is to be mounted, without changing <em>fstab</em>. If it is already mounted, a remount will be triggered. This will always return changed=True. If the mount point <em>path</em> has already a device mounted on, and its source is different than <em>src</em>, the module will fail to avoid unexpected unmount or mount point override. If the mount point is not present, the mount point will be created. The <em>fstab</em> is completely ignored. This option is added in version 1.5.0.</div>
                         <div><code>absent</code> specifies that the device mount&#x27;s entry will be removed from <em>fstab</em> and will also unmount the device and remove the mount point.</div>
-                        <div><code>remounted</code> specifies that the device will be remounted for when you want to force a refresh on the mount itself (added in 2.9). This will always return changed=true. If <em>opts</em> is set, the options will be applied to the remount, but will not change <em>fstab</em>.  Additionally, if <em>opts</em> is set, and the remount command fails, the module will error to prevent unexpected mount changes.  Try using <code>mounted</code> instead to work around this issue.  <code>remounted</code> expects the mount point to be present in the <em>fstab</em>. To remount a mount point not registered in <em>fstab</em>, use <code>ephemeral</code> instead, especially with BSD nodes.</div>
-                        <div><code>absent_from_fstab</code> specifies that the device mount&#x27;s entry will be removed from <em>fstab</em>. This option does not unmount it or delete the mountpoint.</div>
+                        <div><code>remounted</code> specifies that the device will be remounted for when you want to force a refresh on the mount itself (added in 2.9). This will always return changed=true. If <em>opts</em> is set, the options will be applied to the remount, but will not change <em>fstab</em>.  Additionally, if <em>opts</em> is set, and the remount command fails, the module will error to prevent unexpected mount changes.  Try using <code>mounted</code> instead to work around this issue.</div>
                 </td>
             </tr>
     </table>
@@ -301,7 +295,7 @@ Examples
       ansible.posix.mount:
         src: 192.168.1.100:/nfs/ssd/shared_data
         path: /mnt/shared_data
-        opts: rw,sync,hard
+        opts: rw,sync,hard,intr
         state: mounted
         fstype: nfs
 
@@ -309,19 +303,11 @@ Examples
       ansible.posix.mount:
         src: 192.168.1.100:/nfs/ssd/shared_data
         path: /mnt/shared_data
-        opts: rw,sync,hard
-        boot: false
+        opts: rw,sync,hard,intr
+        boot: no
         state: mounted
         fstype: nfs
 
-    - name: Mount ephemeral SMB volume
-      ansible.posix.mount:
-        src: //192.168.1.200/share
-        path: /mnt/smb_share
-        opts: "rw,vers=3,file_mode=0600,dir_mode=0700,dom={{ ad_domain }},username={{ ad_username }},password={{ ad_password }}"
-        fstype: cifs
-        state: ephemeral
-
 
 
 

docs/ansible.posix.patch_module.rst

@@ -84,9 +84,9 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Setting to <code>true</code> will disable patch&#x27;s heuristic for transforming CRLF line endings into LF.</div>
+                        <div>Setting to <code>yes</code> will disable patch&#x27;s heuristic for transforming CRLF line endings into LF.</div>
                         <div>Line endings of src and dest must match.</div>
-                        <div>If set to <code>false</code>, <code>patch</code> will replace CRLF in <code>src</code> files on POSIX.</div>
+                        <div>If set to <code>no</code>, <code>patch</code> will replace CRLF in <code>src</code> files on POSIX.</div>
                 </td>
             </tr>
             <tr>
@@ -122,7 +122,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Setting to <code>true</code> will ignore white space changes between patch and input.</div>
+                        <div>Setting to <code>yes</code> will ignore white space changes between patch and input..</div>
                 </td>
             </tr>
             <tr>
@@ -141,7 +141,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>If <code>false</code>, it will search for src at originating/controller machine, if <code>true</code> it will go to the remote/target machine for the <code>src</code>.</div>
+                        <div>If <code>no</code>, it will search for src at originating/controller machine, if <code>yes</code> it will go to the remote/target machine for the <code>src</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -157,7 +157,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>Path of the patch file as accepted by the GNU patch tool. If <code>remote_src</code> is <code>false</code>, the patch source file is looked up from the module&#x27;s <em>files</em> directory.</div>
+                        <div>Path of the patch file as accepted by the GNU patch tool. If <code>remote_src</code> is &#x27;no&#x27;, the patch source file is looked up from the module&#x27;s <em>files</em> directory.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: patchfile</div>
                 </td>
             </tr>

docs/ansible.posix.rhel_facts_module.rst

@@ -1,103 +0,0 @@
-.. _ansible.posix.rhel_facts_module:
-
-
-************************
-ansible.posix.rhel_facts
-************************
-
-**Facts module to set or override RHEL specific facts.**
-
-
-Version added: 1.5.0
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Synopsis
---------
-- Compatibility layer for using the "package" module for rpm-ostree based systems via setting the "pkg_mgr" fact correctly.
-
-
-
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- rpm-ostree
-
-
-
-
-See Also
---------
-
-.. seealso::
-
-   :ref:`ansible.builtin.package_module`
-      The official documentation on the **ansible.builtin.package** module.
-
-
-Examples
---------
-
-.. code-block:: yaml
-
-    - name: Playbook to use the package module on all RHEL footprints
-      vars:
-        ansible_facts_modules:
-          - setup # REQUIRED to be run before all custom fact modules
-          - ansible.posix.rhel_facts
-      tasks:
-        - name: Ensure packages are installed
-          ansible.builtin.package:
-            name:
-              - htop
-              - ansible
-            state: present
-
-
-Returned Facts
---------------
-Facts returned by this module are added/updated in the ``hostvars`` host facts and can be referenced by name just like any other host fact. They do not need to be registered in order to use them.
-
-.. raw:: html
-
-    <table border=0 cellpadding=0 class="documentation-table">
-                    <tr>
-            <th colspan="1">Fact</th>
-            <th>Returned</th>
-            <th width="100%">Description</th>
-        </tr>
-            <tr>
-                <td colspan="1" colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>pkg_mgr</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this fact"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">string</span>
-                    </div>
-                </td>
-                <td>when needed</td>
-                <td>
-                            <div>System-level package manager override
-                            </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;pkg_mgr&#x27;: &#x27;ansible.posix.rhel_facts&#x27;}</div>
-                </td>
-            </tr>
-    </table>
-    <br/><br/>
-
-
-
-Status
-------
-
-
-Authors
-~~~~~~~
-
-- Adam Miller (@maxamillion)

docs/ansible.posix.rhel_rpm_ostree_module.rst

@@ -1,156 +0,0 @@
-.. _ansible.posix.rhel_rpm_ostree_module:
-
-
-*****************************
-ansible.posix.rhel_rpm_ostree
-*****************************
-
-**Ensure packages exist in a RHEL for Edge rpm-ostree based system**
-
-
-Version added: 1.5.0
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Synopsis
---------
-- Compatibility layer for using the "package" module for RHEL for Edge systems utilizing the RHEL System Roles.
-
-
-
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- rpm-ostree
-
-
-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>name</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>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
-                </td>
-                <td>
-                        <div>A package name or package specifier with version, like <code>name-1.0</code>.</div>
-                        <div>Comparison operators for package version are valid here <code>&gt;</code>, <code>&lt;</code>, <code>&gt;=</code>, <code>&lt;=</code>. Example - <code>name&gt;=1.0</code></div>
-                        <div>If a previous version is specified, the task also needs to turn <code>allow_downgrade</code> on. See the <code>allow_downgrade</code> documentation for caveats with downgrading packages.</div>
-                        <div>When using state=latest, this can be <code>&#x27;*&#x27;</code> which means run <code>yum -y update</code>.</div>
-                        <div>You can also pass a url or a local path to a rpm file (using state=present). To operate on several packages this can accept a comma separated string of packages or (as of 2.0) a list of packages.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: pkg</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>state</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>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li>absent</li>
-                                    <li>installed</li>
-                                    <li>latest</li>
-                                    <li>present</li>
-                                    <li>removed</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Whether to install (<code>present</code> or <code>installed</code>, <code>latest</code>), or remove (<code>absent</code> or <code>removed</code>) a package.</div>
-                        <div><code>present</code> and <code>installed</code> will simply ensure that a desired package is installed.</div>
-                        <div><code>latest</code> will update the specified package if it&#x27;s not of the latest available version.</div>
-                        <div><code>absent</code> and <code>removed</code> will remove the specified package.</div>
-                        <div>Default is <code>None</code>, however in effect the default action is <code>present</code> unless the <code>autoremove</code> option is enabled for this module, then <code>absent</code> is inferred.</div>
-                </td>
-            </tr>
-    </table>
-    <br/>
-
-
-Notes
------
-
-.. note::
-   - This module does not support installing or removing packages to/from an overlay as this is not supported by RHEL for Edge, packages needed should be defined in the osbuild Blueprint and provided to Image Builder at build time. This module exists only for ``package`` module compatibility.
-
-
-
-Examples
---------
-
-.. code-block:: yaml
-
-    - name: Ensure htop and ansible are installed on rpm-ostree based RHEL
-      ansible.posix.rhel_rpm_ostree:
-        name:
-          - htop
-          - ansible
-        state: present
-
-
-
-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="1">Key</th>
-            <th>Returned</th>
-            <th width="100%">Description</th>
-        </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>msg</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>always</td>
-                <td>
-                            <div>status of rpm transaction</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;">No changes made.</div>
-                </td>
-            </tr>
-    </table>
-    <br/><br/>
-
-
-Status
-------
-
-
-Authors
-~~~~~~~
-
-- Adam Miller (@maxamillion)

docs/ansible.posix.rpm_ostree_upgrade_module.rst

@@ -1,175 +0,0 @@
-.. _ansible.posix.rpm_ostree_upgrade_module:
-
-
-********************************
-ansible.posix.rpm_ostree_upgrade
-********************************
-
-**Manage rpm-ostree upgrade transactions**
-
-
-Version added: 1.5.0
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Synopsis
---------
-- Manage an rpm-ostree upgrade transactions.
-
-
-
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- rpm-ostree
-
-
-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>allow_downgrade</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>Allow for the upgrade to be a chronologically older tree.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>cache_only</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>Perform the transaction using only pre-cached data, do not download.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>os</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>
-                        <b>Default:</b><br/><div style="color: blue">""</div>
-                </td>
-                <td>
-                        <div>The OSNAME upon which to operate.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>peer</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>Force peer-to-peer connection instead of using a system message bus.</div>
-                </td>
-            </tr>
-    </table>
-    <br/>
-
-
-
-
-Examples
---------
-
-.. code-block:: yaml
-
-    - name: Upgrade the rpm-ostree image without options, accept all defaults
-      ansible.posix.rpm_ostree_upgrade:
-
-    - name: Upgrade the rpm-ostree image allowing downgrades
-      ansible.posix.rpm_ostree_upgrade:
-        allow_downgrade: true
-
-
-
-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="1">Key</th>
-            <th>Returned</th>
-            <th width="100%">Description</th>
-        </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>msg</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>always</td>
-                <td>
-                            <div>The command standard output</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;">No upgrade available.</div>
-                </td>
-            </tr>
-    </table>
-    <br/><br/>
-
-
-Status
-------
-
-
-Authors
-~~~~~~~
-
-- Adam Miller (@maxamillion)

docs/ansible.posix.seboolean_module.rst

@@ -27,7 +27,6 @@ The below requirements are needed on the host that executes this module.
 
 - libselinux-python
 - libsemanage-python
-- python3-libsemanage
 
 
 Parameters
@@ -92,7 +91,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Set to <code>true</code> if the boolean setting should survive a reboot.</div>
+                        <div>Set to <code>yes</code> if the boolean setting should survive a reboot.</div>
                 </td>
             </tr>
             <tr>
@@ -135,8 +134,8 @@ Examples
     - name: Set httpd_can_network_connect flag on and keep it persistent across reboots
       ansible.posix.seboolean:
         name: httpd_can_network_connect
-        state: true
-        persistent: true
+        state: yes
+        persistent: yes
 
 
 

docs/ansible.posix.selinux_module.rst

@@ -94,27 +94,6 @@ Parameters
                         <div>The SELinux mode.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>update_kernel_param</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.4.0</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>If set to <em>true</em>, will update also the kernel boot parameters when disabling/enabling SELinux.</div>
-                        <div>The <code>grubby</code> tool must be present on the target system for this to work.</div>
-                </td>
-            </tr>
     </table>
     <br/>
 

docs/ansible.posix.synchronize_module.rst

@@ -150,7 +150,7 @@ Parameters
                 </td>
                 <td>
                         <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=true</em>.</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>
@@ -465,7 +465,7 @@ Parameters
                 </td>
                 <td>
                         <div>Put user@ for the remote paths.</div>
-                        <div>If you have a custom ssh config to define the remote user for a host that does not match the inventory user, you should set this parameter to <code>false</code>.</div>
+                        <div>If you have a custom ssh config to define the remote user for a host that does not match the inventory user, you should set this parameter to <code>no</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -502,8 +502,8 @@ Parameters
                 </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>true</code> to allow multiplexing and reduce SSH connection overhead.</div>
-                        <div>Note that simply setting this option to <code>true</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>
+                        <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>
@@ -595,8 +595,8 @@ See Also
 
 .. seealso::
 
-   :ref:`ansible.builtin.copy_module`
-      The official documentation on the **ansible.builtin.copy** module.
+   :ref:`copy_module`
+      The official documentation on the **copy** module.
    :ref:`community.windows.win_robocopy_module`
       The official documentation on the **community.windows.win_robocopy** module.
 
@@ -639,27 +639,27 @@ Examples
       ansible.posix.synchronize:
         src: some/relative/path
         dest: /some/absolute/path
-        archive: false
+        archive: no
 
     - name: Synchronization with --archive options enabled except for --recursive
       ansible.posix.synchronize:
         src: some/relative/path
         dest: /some/absolute/path
-        recursive: false
+        recursive: no
 
     - name: Synchronization with --archive options enabled except for --times, with --checksum option enabled
       ansible.posix.synchronize:
         src: some/relative/path
         dest: /some/absolute/path
-        checksum: true
-        times: false
+        checksum: yes
+        times: no
 
     - name: Synchronization without --archive options enabled except use --links
       ansible.posix.synchronize:
         src: some/relative/path
         dest: /some/absolute/path
-        archive: false
-        links: true
+        archive: no
+        links: yes
 
     - name: Synchronization of two paths both on the control machine
       ansible.posix.synchronize:
@@ -689,8 +689,8 @@ Examples
       ansible.posix.synchronize:
         src: some/relative/path
         dest: /some/absolute/path
-        delete: true
-        recursive: true
+        delete: yes
+        recursive: yes
 
     # This specific command is granted su privileges on the destination
     - name: Synchronize using an alternate rsync command

docs/ansible.posix.sysctl_module.rst

@@ -85,7 +85,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>If <code>true</code>, performs a <em>/sbin/sysctl -p</em> if the <code>sysctl_file</code> is updated. If <code>false</code>, does not reload <em>sysctl</em> even if the <code>sysctl_file</code> is updated.</div>
+                        <div>If <code>yes</code>, performs a <em>/sbin/sysctl -p</em> if the <code>sysctl_file</code> is updated. If <code>no</code>, does not reload <em>sysctl</em> even if the <code>sysctl_file</code> is updated.</div>
                 </td>
             </tr>
             <tr>
@@ -139,7 +139,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Verify token value with the sysctl command and set with -w if necessary.</div>
+                        <div>Verify token value with the sysctl command and set with -w if necessary</div>
                 </td>
             </tr>
             <tr>
@@ -186,21 +186,21 @@ Examples
         name: kernel.panic
         value: '3'
         sysctl_file: /tmp/test_sysctl.conf
-        reload: false
+        reload: no
 
     # Set ip forwarding on in /proc and verify token value with the sysctl command
     - ansible.posix.sysctl:
         name: net.ipv4.ip_forward
         value: '1'
-        sysctl_set: true
+        sysctl_set: yes
 
     # Set ip forwarding on in /proc and in the sysctl file and reload if necessary
     - ansible.posix.sysctl:
         name: net.ipv4.ip_forward
         value: '1'
-        sysctl_set: true
+        sysctl_set: yes
         state: present
-        reload: true
+        reload: yes
 
 
 

galaxy.yml

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

meta/runtime.yml

@@ -1,8 +1,2 @@
 ---
 requires_ansible: '>=2.9'
-plugin_routing:
-  callback:
-    skippy:
-      deprecation:
-        removal_date: '2022-06-01'
-        warning_text: See the plugin documentation for more details

plugins/action/synchronize.py

@@ -225,6 +225,7 @@ class ActionModule(ActionBase):
 
         # 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')
 
         # rsync thinks that one end of the connection is localhost and the
         # other is the host we're running the task for  (Note: We use
@@ -332,9 +333,8 @@ class ActionModule(ActionBase):
         if src is None or dest is None:
             return dict(failed=True, msg="synchronize requires both src and dest parameters are set")
 
-        # Determine if we need a user@ and a password
+        # Determine if we need a user@
         user = None
-        password = task_vars.get('ansible_ssh_pass', None) or task_vars.get('ansible_password', None)
         if not dest_is_local:
             # Src and dest rsync "path" handling
             if boolean(_tmp_args.get('set_remote_user', 'yes'), strict=False):
@@ -344,12 +344,10 @@ class ActionModule(ActionBase):
                         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_user') or self._play_context.remote_user
 
-            if self._templar is not None:
-                user = self._templar.template(user)
-
             # Private key handling
             # Use the private_key parameter if passed else use context private_key_file
             _tmp_args['private_key'] = _tmp_args.get('private_key', self._play_context.private_key_file)
@@ -363,17 +361,12 @@ class ActionModule(ActionBase):
                 # src is a local path, dest is a remote path: <user>@<host>
                 src = self._process_origin(src_host, src, user)
                 dest = self._process_remote(_tmp_args, dest_host, dest, user, inv_port in localhost_ports)
-
-            password = dest_host_inventory_vars.get('ansible_ssh_pass', None) or dest_host_inventory_vars.get('ansible_password', None)
-            if self._templar is not None:
-                password = self._templar.template(password)
         else:
             # Still need to munge paths (to account for roles) even if we aren't
             # copying files between hosts
             src = self._get_absolute_path(path=src)
             dest = self._get_absolute_path(path=dest)
 
-        _tmp_args['_local_rsync_password'] = password
         _tmp_args['src'] = src
         _tmp_args['dest'] = dest
 

plugins/callback/cgroup_perf_recap.py

@@ -11,8 +11,8 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'supported_by': 'community'}
 
 DOCUMENTATION = '''
-    name: cgroup_perf_recap
-    type: aggregate
+    callback: cgroup_perf_recap
+    callback_type: aggregate
     requirements:
       - whitelist in configuration
       - cgroups

plugins/callback/debug.py

@@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: debug
+    callback: debug
     type: stdout
     short_description: formatted stdout/stderr display
     description:

plugins/callback/json.py

@@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: json
+    callback: json
     short_description: Ansible screen output as JSON
     description:
         - This callback converts all events into JSON output to stdout
@@ -25,16 +25,6 @@ DOCUMENTATION = '''
           - key: show_custom_stats
             section: defaults
         type: bool
-      json_indent:
-        name: Use indenting for the JSON output
-        description: 'If specified, use this many spaces for indenting in the JSON output. If <= 0, write to a single line.'
-        default: 4
-        env:
-          - name: ANSIBLE_JSON_INDENT
-        ini:
-          - key: json_indent
-            section: defaults
-        type: integer
     notes:
       - When using a strategy such as free, host_pinned, or a custom strategy, host results will
         be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
@@ -71,19 +61,12 @@ class CallbackModule(CallbackBase):
         self._task_map = {}
         self._is_lockstep = False
 
-        self.set_options()
-
-        self._json_indent = self.get_option('json_indent')
-        if self._json_indent <= 0:
-            self._json_indent = None
-
     def _new_play(self, play):
         self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
         return {
             'play': {
                 'name': play.get_name(),
                 'id': to_text(play._uuid),
-                'path': to_text(play.get_path()),
                 'duration': {
                     'start': current_time()
                 }
@@ -96,7 +79,6 @@ class CallbackModule(CallbackBase):
             'task': {
                 'name': task.get_name(),
                 'id': to_text(task._uuid),
-                'path': to_text(task.get_path()),
                 'duration': {
                     'start': current_time()
                 }
@@ -161,7 +143,7 @@ class CallbackModule(CallbackBase):
             'global_custom_stats': global_custom_stats,
         }
 
-        self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=self._json_indent, sort_keys=True))
+        self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=4, sort_keys=True))
 
     def _record_task_result(self, on_info, result, **kwargs):
         """This function is used as a partial to add failed/skipped info in a single method"""

plugins/callback/jsonl.py

@@ -1,214 +0,0 @@
-# (c) 2016, Matt Martz <matt@sivel.net>
-# (c) 2017 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    name: jsonl
-    short_description: Ansible screen output as JSONL (lines in json format)
-    description:
-        - This callback converts all events into JSON output to stdout
-        - This callback in contrast with ansible.posix.json uses less memory, because it doesn't store results.
-    type: stdout
-    requirements:
-      - Set as stdout in config
-    options:
-      show_custom_stats:
-        name: Show custom stats
-        description: 'This adds the custom stats set via the set_stats plugin to the play recap'
-        default: False
-        env:
-          - name: ANSIBLE_SHOW_CUSTOM_STATS
-        ini:
-          - key: show_custom_stats
-            section: defaults
-        type: bool
-      json_indent:
-        name: Use indenting for the JSON output
-        description: 'If specified, use this many spaces for indenting in the JSON output. If not specified or <= 0, write to a single line.'
-        default: 0
-        env:
-          - name: ANSIBLE_JSON_INDENT
-        ini:
-          - key: json_indent
-            section: defaults
-        type: integer
-    notes:
-      - When using a strategy such as free, host_pinned, or a custom strategy, host results will
-        be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
-        task objects indicated by duplicate task IDs at ``.plays[].tasks[].task.id``, each with an
-        individual host result for the task.
-'''
-
-import datetime
-import json
-import copy
-
-from functools import partial
-
-from ansible.inventory.host import Host
-from ansible.module_utils._text import to_text
-from ansible.parsing.ajson import AnsibleJSONEncoder
-from ansible.plugins.callback import CallbackBase
-
-
-LOCKSTEP_CALLBACKS = frozenset(('linear', 'debug'))
-
-
-def current_time():
-    return '%sZ' % datetime.datetime.utcnow().isoformat()
-
-
-class CallbackModule(CallbackBase):
-    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'stdout'
-    CALLBACK_NAME = 'ansible.posix.jsonl'
-
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display)
-        self.results = []
-        self._task_map = {}
-        self._is_lockstep = False
-
-        self.set_options()
-
-        self._json_indent = self.get_option('json_indent')
-        if self._json_indent <= 0:
-            self._json_indent = None
-
-    def _new_play(self, play):
-        self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
-        return {
-            'play': {
-                'name': play.get_name(),
-                'id': to_text(play._uuid),
-                'path': to_text(play.get_path()),
-                'duration': {
-                    'start': current_time()
-                }
-            },
-            'tasks': []
-        }
-
-    def _new_task(self, task):
-        return {
-            'task': {
-                'name': task.get_name(),
-                'id': to_text(task._uuid),
-                'path': to_text(task.get_path()),
-                'duration': {
-                    'start': current_time()
-                }
-            },
-            'hosts': {}
-        }
-
-    def _find_result_task(self, host, task):
-        key = (host.get_name(), task._uuid)
-        return self._task_map.get(
-            key,
-            self.results[-1]['tasks'][-1]
-        )
-
-    def v2_playbook_on_play_start(self, play):
-        play_result = self._new_play(play)
-        self.results.append(play_result)
-        self._write_event('v2_playbook_on_play_start', play_result)
-
-    def v2_runner_on_start(self, host, task):
-        if self._is_lockstep:
-            return
-        key = (host.get_name(), task._uuid)
-        task_result = self._new_task(task)
-        self._task_map[key] = task_result
-        self.results[-1]['tasks'].append(task_result)
-        self._write_event('v2_runner_on_start', task_result)
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        if not self._is_lockstep:
-            return
-        task_result = self._new_task(task)
-        self.results[-1]['tasks'].append(task_result)
-        self._write_event('v2_playbook_on_task_start', task_result)
-
-    def v2_playbook_on_handler_task_start(self, task):
-        if not self._is_lockstep:
-            return
-        task_result = self._new_task(task)
-        self.results[-1]['tasks'].append(task_result)
-        self._write_event('v2_playbook_on_handler_task_start', task_result)
-
-    def _convert_host_to_name(self, key):
-        if isinstance(key, (Host,)):
-            return key.get_name()
-        return key
-
-    def v2_playbook_on_stats(self, stats):
-        """Display info about playbook statistics"""
-
-        hosts = sorted(stats.processed.keys())
-
-        summary = {}
-        for h in hosts:
-            s = stats.summarize(h)
-            summary[h] = s
-
-        custom_stats = {}
-        global_custom_stats = {}
-
-        if self.get_option('show_custom_stats') and stats.custom:
-            custom_stats.update(dict((self._convert_host_to_name(k), v) for k, v in stats.custom.items()))
-            global_custom_stats.update(custom_stats.pop('_run', {}))
-
-        output = {
-            'stats': summary,
-            'custom_stats': custom_stats,
-            'global_custom_stats': global_custom_stats,
-        }
-
-        self._write_event('v2_playbook_on_stats', output)
-
-    def _write_event(self, event_name, output):
-        output['_event'] = event_name
-        output['_timestamp'] = current_time()
-        self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=self._json_indent, separators=',:', sort_keys=True))
-
-    def _record_task_result(self, event_name, on_info, result, **kwargs):
-        """This function is used as a partial to add failed/skipped info in a single method"""
-        host = result._host
-        task = result._task
-
-        result_copy = result._result.copy()
-        result_copy.update(on_info)
-        result_copy['action'] = task.action
-
-        task_result = self._find_result_task(host, task)
-
-        end_time = current_time()
-        task_result['task']['duration']['end'] = end_time
-        self.results[-1]['play']['duration']['end'] = end_time
-
-        task_result_copy = copy.deepcopy(task_result)
-        task_result_copy['hosts'][host.name] = result_copy
-
-        if not self._is_lockstep:
-            key = (host.get_name(), task._uuid)
-            del self._task_map[key]
-
-        self._write_event(event_name, task_result_copy)
-
-    def __getattribute__(self, name):
-        """Return ``_record_task_result`` partial with a dict containing skipped/failed if necessary"""
-        if name not in ('v2_runner_on_ok', 'v2_runner_on_failed', 'v2_runner_on_unreachable', 'v2_runner_on_skipped'):
-            return object.__getattribute__(self, name)
-
-        on = name.rsplit('_', 1)[1]
-
-        on_info = {}
-        if on in ('failed', 'skipped'):
-            on_info[on] = True
-
-        return partial(self._record_task_result, name, on_info)

plugins/callback/profile_roles.py

@@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: profile_roles
+    callback: profile_roles
     type: aggregate
     short_description: adds timing information to roles
     description:

plugins/callback/profile_tasks.py

@@ -10,18 +10,18 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: profile_tasks
+    callback: profile_tasks
     type: aggregate
     short_description: adds time information to tasks
     description:
       - Ansible callback plugin for timing individual tasks and overall execution time.
       - "Mashup of 2 excellent original works: https://github.com/jlafon/ansible-profile,
          https://github.com/junaid18183/ansible_home/blob/master/ansible_plugins/callback_plugins/timestamp.py.old"
-      - "Format: C(<task start timestamp>) C(<length of previous task>) C(<current elapsed playbook execution time>)"
+      - "Format: C(<task start timestamp> (<length of previous task>) <current elapsed playbook execution time>)"
       - It also lists the top/bottom time consuming tasks in the summary (configurable)
       - Before 2.4 only the environment variables were available for configuration.
     requirements:
-      - enable in configuration - see examples section below for details.
+      - whitelisting in configuration - see examples section below for details.
     options:
       output_limit:
         description: Number of tasks to display in the summary
@@ -46,7 +46,7 @@ EXAMPLES = '''
 example: >
   To enable, add this to your ansible.cfg file in the defaults block
     [defaults]
-    callbacks_enabled=ansible.posix.profile_tasks
+    callback_whitelist = ansible.posix.profile_tasks
 sample output: >
 #
 #    TASK: [ensure messaging security group exists] ********************************

plugins/callback/skippy.py

@@ -7,19 +7,19 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: skippy
-    type: stdout
+    callback: skippy
+    callback_type: stdout
     requirements:
       - set as main display callback
     short_description: Ansible screen output that ignores skipped status
     deprecated:
-      why: The 'default' callback plugin now supports this functionality
-      removed_at_date: '2022-06-01'
-      alternative: "'default' callback plugin with 'display_skipped_hosts = no' option"
+        why: The 'default' callback plugin now supports this functionality
+        removed_at_date: 2022-06-01
+        alternative: "'default' callback plugin with 'display_skipped_hosts = no' option"
     extends_documentation_fragment:
       - default_callback
     description:
-      - This callback does the same as the default except it does not output skipped host/task/item status
+        - This callback does the same as the default except it does not output skipped host/task/item status
 '''
 
 from ansible.plugins.callback.default import CallbackModule as CallbackModule_default

plugins/callback/timer.py

@@ -6,8 +6,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    name: timer
-    type: aggregate
+    callback: timer
+    callback_type: aggregate
     requirements:
       - whitelist in configuration
     short_description: Adds time to play stats

plugins/module_utils/_version.py

@@ -1,344 +0,0 @@
-# Vendored copy of distutils/version.py from CPython 3.9.5
-#
-# Implements multiple version numbering conventions for the
-# Python Module Distribution Utilities.
-#
-# PSF License (see PSF-license.txt or https://opensource.org/licenses/Python-2.0)
-#
-
-"""Provides classes to represent module version numbers (one class for
-each style of version numbering).  There are currently two such classes
-implemented: StrictVersion and LooseVersion.
-
-Every version number class implements the following interface:
-  * the 'parse' method takes a string and parses it to some internal
-    representation; if the string is an invalid version number,
-    'parse' raises a ValueError exception
-  * the class constructor takes an optional string argument which,
-    if supplied, is passed to 'parse'
-  * __str__ reconstructs the string that was passed to 'parse' (or
-    an equivalent string -- ie. one that will generate an equivalent
-    version number instance)
-  * __repr__ generates Python code to recreate the version number instance
-  * _cmp compares the current instance with either another instance
-    of the same class or a string (which will be parsed to an instance
-    of the same class, thus must follow the same rules)
-"""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-import re
-
-try:
-    RE_FLAGS = re.VERBOSE | re.ASCII
-except AttributeError:
-    RE_FLAGS = re.VERBOSE
-
-
-class Version:
-    """Abstract base class for version numbering classes.  Just provides
-    constructor (__init__) and reproducer (__repr__), because those
-    seem to be the same for all version numbering classes; and route
-    rich comparisons to _cmp.
-    """
-
-    def __init__(self, vstring=None):
-        if vstring:
-            self.parse(vstring)
-
-    def __repr__(self):
-        return "%s ('%s')" % (self.__class__.__name__, str(self))
-
-    def __eq__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c == 0
-
-    def __lt__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c < 0
-
-    def __le__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c <= 0
-
-    def __gt__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c > 0
-
-    def __ge__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c >= 0
-
-
-# Interface for version-number classes -- must be implemented
-# by the following classes (the concrete ones -- Version should
-# be treated as an abstract class).
-#    __init__ (string) - create and take same action as 'parse'
-#                        (string parameter is optional)
-#    parse (string)    - convert a string representation to whatever
-#                        internal representation is appropriate for
-#                        this style of version numbering
-#    __str__ (self)    - convert back to a string; should be very similar
-#                        (if not identical to) the string supplied to parse
-#    __repr__ (self)   - generate Python code to recreate
-#                        the instance
-#    _cmp (self, other) - compare two version numbers ('other' may
-#                        be an unparsed version string, or another
-#                        instance of your version class)
-
-
-class StrictVersion(Version):
-    """Version numbering for anal retentives and software idealists.
-    Implements the standard interface for version number classes as
-    described above.  A version number consists of two or three
-    dot-separated numeric components, with an optional "pre-release" tag
-    on the end.  The pre-release tag consists of the letter 'a' or 'b'
-    followed by a number.  If the numeric components of two version
-    numbers are equal, then one with a pre-release tag will always
-    be deemed earlier (lesser) than one without.
-
-    The following are valid version numbers (shown in the order that
-    would be obtained by sorting according to the supplied cmp function):
-
-        0.4       0.4.0  (these two are equivalent)
-        0.4.1
-        0.5a1
-        0.5b3
-        0.5
-        0.9.6
-        1.0
-        1.0.4a3
-        1.0.4b1
-        1.0.4
-
-    The following are examples of invalid version numbers:
-
-        1
-        2.7.2.2
-        1.3.a4
-        1.3pl1
-        1.3c4
-
-    The rationale for this version numbering system will be explained
-    in the distutils documentation.
-    """
-
-    version_re = re.compile(r"^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$", RE_FLAGS)
-
-    def parse(self, vstring):
-        match = self.version_re.match(vstring)
-        if not match:
-            raise ValueError("invalid version number '%s'" % vstring)
-
-        (major, minor, patch, prerelease, prerelease_num) = match.group(1, 2, 4, 5, 6)
-
-        if patch:
-            self.version = tuple(map(int, [major, minor, patch]))
-        else:
-            self.version = tuple(map(int, [major, minor])) + (0,)
-
-        if prerelease:
-            self.prerelease = (prerelease[0], int(prerelease_num))
-        else:
-            self.prerelease = None
-
-    def __str__(self):
-        if self.version[2] == 0:
-            vstring = ".".join(map(str, self.version[0:2]))
-        else:
-            vstring = ".".join(map(str, self.version))
-
-        if self.prerelease:
-            vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
-
-        return vstring
-
-    def _cmp(self, other):
-        if isinstance(other, str):
-            other = StrictVersion(other)
-        elif not isinstance(other, StrictVersion):
-            return NotImplemented
-
-        if self.version != other.version:
-            # numeric versions don't match
-            # prerelease stuff doesn't matter
-            if self.version < other.version:
-                return -1
-            else:
-                return 1
-
-        # have to compare prerelease
-        # case 1: neither has prerelease; they're equal
-        # case 2: self has prerelease, other doesn't; other is greater
-        # case 3: self doesn't have prerelease, other does: self is greater
-        # case 4: both have prerelease: must compare them!
-
-        if not self.prerelease and not other.prerelease:
-            return 0
-        elif self.prerelease and not other.prerelease:
-            return -1
-        elif not self.prerelease and other.prerelease:
-            return 1
-        elif self.prerelease and other.prerelease:
-            if self.prerelease == other.prerelease:
-                return 0
-            elif self.prerelease < other.prerelease:
-                return -1
-            else:
-                return 1
-        else:
-            raise AssertionError("never get here")
-
-
-# end class StrictVersion
-
-# The rules according to Greg Stein:
-# 1) a version number has 1 or more numbers separated by a period or by
-#    sequences of letters. If only periods, then these are compared
-#    left-to-right to determine an ordering.
-# 2) sequences of letters are part of the tuple for comparison and are
-#    compared lexicographically
-# 3) recognize the numeric components may have leading zeroes
-#
-# The LooseVersion class below implements these rules: a version number
-# string is split up into a tuple of integer and string components, and
-# comparison is a simple tuple comparison.  This means that version
-# numbers behave in a predictable and obvious way, but a way that might
-# not necessarily be how people *want* version numbers to behave.  There
-# wouldn't be a problem if people could stick to purely numeric version
-# numbers: just split on period and compare the numbers as tuples.
-# However, people insist on putting letters into their version numbers;
-# the most common purpose seems to be:
-#   - indicating a "pre-release" version
-#     ('alpha', 'beta', 'a', 'b', 'pre', 'p')
-#   - indicating a post-release patch ('p', 'pl', 'patch')
-# but of course this can't cover all version number schemes, and there's
-# no way to know what a programmer means without asking him.
-#
-# The problem is what to do with letters (and other non-numeric
-# characters) in a version number.  The current implementation does the
-# obvious and predictable thing: keep them as strings and compare
-# lexically within a tuple comparison.  This has the desired effect if
-# an appended letter sequence implies something "post-release":
-# eg. "0.99" < "0.99pl14" < "1.0", and "5.001" < "5.001m" < "5.002".
-#
-# However, if letters in a version number imply a pre-release version,
-# the "obvious" thing isn't correct.  Eg. you would expect that
-# "1.5.1" < "1.5.2a2" < "1.5.2", but under the tuple/lexical comparison
-# implemented here, this just isn't so.
-#
-# Two possible solutions come to mind.  The first is to tie the
-# comparison algorithm to a particular set of semantic rules, as has
-# been done in the StrictVersion class above.  This works great as long
-# as everyone can go along with bondage and discipline.  Hopefully a
-# (large) subset of Python module programmers will agree that the
-# particular flavour of bondage and discipline provided by StrictVersion
-# provides enough benefit to be worth using, and will submit their
-# version numbering scheme to its domination.  The free-thinking
-# anarchists in the lot will never give in, though, and something needs
-# to be done to accommodate them.
-#
-# Perhaps a "moderately strict" version class could be implemented that
-# lets almost anything slide (syntactically), and makes some heuristic
-# assumptions about non-digits in version number strings.  This could
-# sink into special-case-hell, though; if I was as talented and
-# idiosyncratic as Larry Wall, I'd go ahead and implement a class that
-# somehow knows that "1.2.1" < "1.2.2a2" < "1.2.2" < "1.2.2pl3", and is
-# just as happy dealing with things like "2g6" and "1.13++".  I don't
-# think I'm smart enough to do it right though.
-#
-# In any case, I've coded the test suite for this module (see
-# ../test/test_version.py) specifically to fail on things like comparing
-# "1.2a2" and "1.2".  That's not because the *code* is doing anything
-# wrong, it's because the simple, obvious design doesn't match my
-# complicated, hairy expectations for real-world version numbers.  It
-# would be a snap to fix the test suite to say, "Yep, LooseVersion does
-# the Right Thing" (ie. the code matches the conception).  But I'd rather
-# have a conception that matches common notions about version numbers.
-
-
-class LooseVersion(Version):
-    """Version numbering for anarchists and software realists.
-    Implements the standard interface for version number classes as
-    described above.  A version number consists of a series of numbers,
-    separated by either periods or strings of letters.  When comparing
-    version numbers, the numeric components will be compared
-    numerically, and the alphabetic components lexically.  The following
-    are all valid version numbers, in no particular order:
-
-        1.5.1
-        1.5.2b2
-        161
-        3.10a
-        8.02
-        3.4j
-        1996.07.12
-        3.2.pl0
-        3.1.1.6
-        2g6
-        11g
-        0.960923
-        2.2beta29
-        1.13++
-        5.5.kw
-        2.0b1pl0
-
-    In fact, there is no such thing as an invalid version number under
-    this scheme; the rules for comparison are simple and predictable,
-    but may not always give the results you want (for some definition
-    of "want").
-    """
-
-    component_re = re.compile(r"(\d+ | [a-z]+ | \.)", re.VERBOSE)
-
-    def __init__(self, vstring=None):
-        if vstring:
-            self.parse(vstring)
-
-    def parse(self, vstring):
-        # I've given up on thinking I can reconstruct the version string
-        # from the parsed tuple -- so I just store the string here for
-        # use by __str__
-        self.vstring = vstring
-        components = [x for x in self.component_re.split(vstring) if x and x != "."]
-        for i, obj in enumerate(components):
-            try:
-                components[i] = int(obj)
-            except ValueError:
-                pass
-
-        self.version = components
-
-    def __str__(self):
-        return self.vstring
-
-    def __repr__(self):
-        return "LooseVersion ('%s')" % str(self)
-
-    def _cmp(self, other):
-        if isinstance(other, str):
-            other = LooseVersion(other)
-        elif not isinstance(other, LooseVersion):
-            return NotImplemented
-
-        if self.version == other.version:
-            return 0
-        if self.version < other.version:
-            return -1
-        if self.version > other.version:
-            return 1
-
-
-# end class LooseVersion

plugins/module_utils/firewalld.py

@@ -4,11 +4,11 @@
 # 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
-from ansible_collections.ansible.posix.plugins.module_utils.version import LooseVersion
-from ansible.module_utils.basic import missing_required_lib
 
 __metaclass__ = type
 
+# Imports and info for sanity checking
+from distutils.version import LooseVersion
 
 FW_VERSION = None
 fw = None
@@ -315,5 +315,6 @@ class FirewallTransaction(object):
 
         if import_failure:
             module.fail_json(
-                msg=missing_required_lib('firewall') + '. Version 0.2.11 or newer required (0.3.9 or newer for offline operations)'
+                msg='Python Module not found: firewalld and its python module are required for this module, \
+                        version 0.2.11 or newer required (0.3.9 or newer for offline operations)'
             )

plugins/module_utils/version.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Felix Fontein <felix@fontein.de>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""Provide version object to compare version numbers."""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-
-# Once we drop support for Ansible 2.9, ansible-base 2.10, and ansible-core 2.11, we can
-# remove the _version.py file, and replace the following import by
-#
-#     from ansible.module_utils.compat.version import LooseVersion
-
-from ._version import LooseVersion, StrictVersion
-
-__all__ = ['LooseVersion', 'StrictVersion']

plugins/modules/acl.py

@@ -20,7 +20,7 @@ options:
     description:
     - The full path of the file or object.
     type: path
-    required: true
+    required: yes
     aliases: [ name ]
   state:
     description:
@@ -33,18 +33,17 @@ options:
     description:
     - Whether to follow symlinks on the path if a symlink is encountered.
     type: bool
-    default: true
+    default: yes
   default:
     description:
-    - If the target is a directory, setting this to C(true) will make it the default ACL for entities created inside the directory.
-    - Setting C(default) to C(true) causes an error if the path is a file.
+    - If the target is a directory, setting this to C(yes) will make it the default ACL for entities created inside the directory.
+    - Setting C(default) to C(yes) causes an error if the path is a file.
     type: bool
-    default: false
+    default: no
   entity:
     description:
     - The actual user or group that the ACL applies to when matching entity types user or group are selected.
     type: str
-    default: ""
   etype:
     description:
     - The entity type of the ACL to apply, see C(setfacl) documentation for more info.
@@ -70,13 +69,13 @@ options:
     - Incompatible with C(state=query).
     - Alias C(recurse) added in version 1.3.0.
     type: bool
-    default: false
+    default: no
     aliases: [ recurse ]
   use_nfsv4_acls:
     description:
     - Use NFSv4 ACLs instead of POSIX ACLs.
     type: bool
-    default: false
+    default: no
   recalculate_mask:
     description:
     - Select if and when to recalculate the effective right masks of the files.
@@ -116,7 +115,7 @@ EXAMPLES = r'''
     entity: joe
     etype: user
     permissions: rw
-    default: true
+    default: yes
     state: present
 
 - name: Same as previous but using entry shorthand

plugins/modules/at.py

@@ -44,7 +44,7 @@ options:
     description:
      - If a matching job is present a new job will not be added.
     type: bool
-    default: false
+    default: no
 requirements:
  - at
 author:
@@ -68,7 +68,7 @@ EXAMPLES = r'''
     command: ls -d / >/dev/null
     count: 20
     units: minutes
-    unique: true
+    unique: yes
 '''
 
 import os

plugins/modules/authorized_key.py

@@ -34,13 +34,13 @@ options:
   manage_dir:
     description:
       - Whether this module should manage the directory of the authorized key file.
-      - If set to C(true), the module will create the directory, as well as set the owner and permissions
+      - If set to C(yes), the module will create the directory, as well as set the owner and permissions
         of an existing directory.
-      - Be sure to set C(manage_dir=false) if you are using an alternate directory for authorized_keys,
+      - Be sure to set C(manage_dir=no) if you are using an alternate directory for authorized_keys,
         as set with C(path), since you could lock yourself out of SSH access.
       - See the example below.
     type: bool
-    default: true
+    default: yes
   state:
     description:
       - Whether the given key (with the given key_options) should or should not be in the file.
@@ -58,15 +58,15 @@ options:
       - This option is not loop aware, so if you use C(with_) , it will be exclusive per iteration of the loop.
       - If you want multiple keys in the file you need to pass them all to C(key) in a single batch as mentioned above.
     type: bool
-    default: false
+    default: no
   validate_certs:
     description:
       - This only applies if using a https url as the source of the keys.
-      - If set to C(false), the SSL certificates will not be validated.
-      - This should only set to C(false) used on personally controlled sites using self-signed certificates as it avoids verifying the source site.
-      - Prior to 2.1 the code worked as if this was set to C(true).
+      - If set to C(no), the SSL certificates will not be validated.
+      - This should only set to C(no) used on personally controlled sites using self-signed certificates as it avoids verifying the source site.
+      - Prior to 2.1 the code worked as if this was set to C(yes).
     type: bool
-    default: true
+    default: yes
   comment:
     description:
       - Change the comment on the public key.
@@ -77,7 +77,7 @@ options:
     description:
       - Follow path symlink instead of replacing it.
     type: bool
-    default: false
+    default: no
 author: Ansible Core Team
 '''
 
@@ -106,7 +106,7 @@ EXAMPLES = r'''
     state: present
     key: "{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}"
     path: /etc/ssh/authorized_keys/charlie
-    manage_dir: false
+    manage_dir: False
 
 - name: Set up multiple authorized keys
   ansible.posix.authorized_key:
@@ -129,14 +129,14 @@ EXAMPLES = r'''
     user: charlie
     state: present
     key: https://github.com/user.keys
-    validate_certs: false
+    validate_certs: False
 
 - name: Set authorized key, removing all the authorized keys already set
   ansible.posix.authorized_key:
     user: root
     key: "{{ lookup('file', 'public_keys/doe-jane') }}"
     state: present
-    exclusive: true
+    exclusive: True
 
 - name: Set authorized key for user ubuntu copying it from current user
   ansible.posix.authorized_key:
@@ -150,7 +150,7 @@ exclusive:
   description: If the key has been forced to be exclusive or not.
   returned: success
   type: bool
-  sample: false
+  sample: False
 key:
   description: The key that the module was running against.
   returned: success
@@ -170,7 +170,7 @@ manage_dir:
   description: Whether this module managed the directory of the authorized key file.
   returned: success
   type: bool
-  sample: true
+  sample: True
 path:
   description: Alternate path to the authorized_keys file
   returned: success
@@ -192,7 +192,7 @@ user:
   type: str
   sample: user
 validate_certs:
-  description: This only applies if using a https url as the source of the keys. If set to C(false), the SSL certificates will not be validated.
+  description: This only applies if using a https url as the source of the keys. If set to C(no), the SSL certificates will not be validated.
   returned: success
   type: bool
   sample: true
@@ -347,8 +347,6 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
         basedir = os.path.dirname(keysfile)
         if not os.path.exists(basedir):
             os.makedirs(basedir)
-
-        f = None
         try:
             f = open(keysfile, "w")  # touches file so we can set ownership and perms
         finally:

plugins/modules/firewalld.py

@@ -19,10 +19,6 @@ options:
       - Name of a service to add/remove to/from firewalld.
       - The service must be listed in output of firewall-cmd --get-services.
     type: str
-  protocol:
-    description:
-      - Name of a protocol to add/remove to/from firewalld.
-    type: str
   port:
     description:
       - Name of a port or port range to add/remove to/from firewalld.
@@ -86,13 +82,13 @@ options:
     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 >= 0.3.9).
-      - Note that if this is C(false), immediate is assumed C(true).
+      - Note that if this is C(no), immediate is assumed C(yes).
     type: bool
   immediate:
     description:
       - Should this configuration be applied immediately, if set as permanent.
     type: bool
-    default: false
+    default: no
   state:
     description:
       - Enable or disable a setting.
@@ -132,11 +128,8 @@ notes:
     The module will not take care of this for you implicitly because that would undo any previously performed immediate actions which were not
     permanent. Therefore, if you require immediate access to a newly created zone it is recommended you reload firewalld immediately after the zone
     creation returns with a changed state and before you perform any other immediate, non-permanent actions on that zone.
-  - This module needs C(python-firewall) or C(python3-firewall) on managed nodes.
-    It is usually provided as a subset with C(firewalld) from the OS distributor for the OS default Python interpreter.
 requirements:
 - firewalld >= 0.2.11
-- python-firewall >= 0.2.11
 author:
 - Adam Miller (@maxamillion)
 '''
@@ -145,35 +138,29 @@ EXAMPLES = r'''
 - name: permit traffic in default zone for https service
   ansible.posix.firewalld:
     service: https
-    permanent: true
-    state: enabled
-
-- name: permit ospf traffic
-  ansible.posix.firewalld:
-    protocol: ospf
-    permanent: true
+    permanent: yes
     state: enabled
 
 - name: do not permit traffic in default zone on port 8081/tcp
   ansible.posix.firewalld:
     port: 8081/tcp
-    permanent: true
+    permanent: yes
     state: disabled
 
 - ansible.posix.firewalld:
     port: 161-162/udp
-    permanent: true
+    permanent: yes
     state: enabled
 
 - ansible.posix.firewalld:
     zone: dmz
     service: http
-    permanent: true
+    permanent: yes
     state: enabled
 
 - ansible.posix.firewalld:
     rich_rule: rule service name="ftp" audit limit value="1/m" accept
-    permanent: true
+    permanent: yes
     state: enabled
 
 - ansible.posix.firewalld:
@@ -184,44 +171,44 @@ EXAMPLES = r'''
 - ansible.posix.firewalld:
     zone: trusted
     interface: eth2
-    permanent: true
+    permanent: yes
     state: enabled
 
 - ansible.posix.firewalld:
-    masquerade: true
+    masquerade: yes
     state: enabled
-    permanent: true
+    permanent: yes
     zone: dmz
 
 - ansible.posix.firewalld:
     zone: custom
     state: present
-    permanent: true
+    permanent: yes
 
 - ansible.posix.firewalld:
     zone: drop
     state: enabled
-    permanent: true
-    icmp_block_inversion: true
+    permanent: yes
+    icmp_block_inversion: yes
 
 - ansible.posix.firewalld:
     zone: drop
     state: enabled
-    permanent: true
+    permanent: yes
     icmp_block: echo-request
 
 - ansible.posix.firewalld:
     zone: internal
     state: present
-    permanent: true
+    permanent: yes
     target: ACCEPT
 
 - name: Redirect port 443 to 8443 with Rich Rule
   ansible.posix.firewalld:
     rich_rule: rule family=ipv4 forward-port port=443 protocol=tcp to-port=8443
     zone: public
-    permanent: true
-    immediate: true
+    permanent: yes
+    immediate: yes
     state: enabled
 '''
 
@@ -353,47 +340,6 @@ class ServiceTransaction(FirewallTransaction):
         self.update_fw_settings(fw_zone, fw_settings)
 
 
-class ProtocolTransaction(FirewallTransaction):
-    """
-    ProtocolTransaction
-    """
-
-    def __init__(self, module, action_args=None, zone=None, desired_state=None, permanent=False, immediate=False):
-        super(ProtocolTransaction, self).__init__(
-            module, action_args=action_args, desired_state=desired_state, zone=zone, permanent=permanent, immediate=immediate
-        )
-
-    def get_enabled_immediate(self, protocol, timeout):
-        if protocol in self.fw.getProtocols(self.zone):
-            return True
-        else:
-            return False
-
-    def get_enabled_permanent(self, protocol, timeout):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-
-        if protocol in fw_settings.getProtocols():
-            return True
-        else:
-            return False
-
-    def set_enabled_immediate(self, protocol, timeout):
-        self.fw.addProtocol(self.zone, protocol, timeout)
-
-    def set_enabled_permanent(self, protocol, timeout):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-        fw_settings.addProtocol(protocol)
-        self.update_fw_settings(fw_zone, fw_settings)
-
-    def set_disabled_immediate(self, protocol, timeout):
-        self.fw.removeProtocol(self.zone, protocol)
-
-    def set_disabled_permanent(self, protocol, timeout):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-        fw_settings.removeProtocol(protocol)
-        self.update_fw_settings(fw_zone, fw_settings)
-
-
 class MasqueradeTransaction(FirewallTransaction):
     """
     MasqueradeTransaction
@@ -520,7 +466,6 @@ class InterfaceTransaction(FirewallTransaction):
                 old_zone_obj = self.fw.config.get_zone(zone)
                 if interface in old_zone_obj.interfaces:
                     iface_zone_objs.append(old_zone_obj)
-
             if len(iface_zone_objs) > 1:
                 # Even it shouldn't happen, it's actually possible that
                 # the same interface is in several zone XML files
@@ -530,17 +475,18 @@ class InterfaceTransaction(FirewallTransaction):
                         len(iface_zone_objs)
                     )
                 )
-            elif len(iface_zone_objs) == 1 and iface_zone_objs[0].name != self.zone:
-                old_zone_obj = iface_zone_objs[0]
-                old_zone_config = self.fw.config.get_zone_config(old_zone_obj)
-                old_zone_settings = FirewallClientZoneSettings(list(old_zone_config))
+            old_zone_obj = iface_zone_objs[0]
+            if old_zone_obj.name != self.zone:
+                old_zone_settings = FirewallClientZoneSettings(
+                    self.fw.config.get_zone_config(old_zone_obj)
+                )
                 old_zone_settings.removeInterface(interface)    # remove from old
                 self.fw.config.set_zone_config(
                     old_zone_obj,
                     old_zone_settings.settings
                 )
-            fw_settings.addInterface(interface)             # add to new
-            self.fw.config.set_zone_config(fw_zone, fw_settings.settings)
+                fw_settings.addInterface(interface)             # add to new
+                self.fw.config.set_zone_config(fw_zone, fw_settings.settings)
         else:
             old_zone_name = self.fw.config().getZoneOfInterface(interface)
             if old_zone_name != self.zone:
@@ -726,33 +672,25 @@ class ZoneTransaction(FirewallTransaction):
         self.module.fail_json(msg=self.tx_not_permanent_error_msg)
 
     def get_enabled_permanent(self):
-        if self.fw_offline:
-            zones = self.fw.config.get_zones()
-            zone_names = [self.fw.config.get_zone(z).name for z in zones]
+        zones = self.fw.config().listZones()
+        zone_names = [self.fw.config().getZone(z).get_property("name") for z in zones]
+        if self.zone in zone_names:
+            return True
         else:
-            zones = self.fw.config().listZones()
-            zone_names = [self.fw.config().getZone(z).get_property("name") for z in zones]
-        return self.zone in zone_names
+            return False
 
     def set_enabled_immediate(self):
         self.module.fail_json(msg=self.tx_not_permanent_error_msg)
 
     def set_enabled_permanent(self):
-        if self.fw_offline:
-            self.fw.config.new_zone(self.zone, FirewallClientZoneSettings().settings)
-        else:
-            self.fw.config().addZone(self.zone, FirewallClientZoneSettings())
+        self.fw.config().addZone(self.zone, FirewallClientZoneSettings())
 
     def set_disabled_immediate(self):
         self.module.fail_json(msg=self.tx_not_permanent_error_msg)
 
     def set_disabled_permanent(self):
-        if self.fw_offline:
-            zone = self.fw.config.get_zone(self.zone)
-            self.fw.config.remove_zone(zone)
-        else:
-            zone_obj = self.fw.config().getZoneByName(self.zone)
-            zone_obj.remove()
+        zone_obj = self.fw.config().getZoneByName(self.zone)
+        zone_obj.remove()
 
 
 class ForwardPortTransaction(FirewallTransaction):
@@ -799,7 +737,6 @@ def main():
             icmp_block=dict(type='str'),
             icmp_block_inversion=dict(type='str'),
             service=dict(type='str'),
-            protocol=dict(type='str'),
             port=dict(type='str'),
             port_forward=dict(type='list', elements='dict'),
             rich_rule=dict(type='str'),
@@ -820,10 +757,6 @@ def main():
             target=('zone',),
             source=('permanent',),
         ),
-        mutually_exclusive=[
-            ['icmp_block', 'icmp_block_inversion', 'service', 'protocol', 'port', 'port_forward', 'rich_rule',
-             'interface', 'masquerade', 'source', 'target']
-        ],
     )
 
     permanent = module.params['permanent']
@@ -850,22 +783,20 @@ def main():
     icmp_block = module.params['icmp_block']
     icmp_block_inversion = module.params['icmp_block_inversion']
     service = module.params['service']
-    protocol = module.params['protocol']
     rich_rule = module.params['rich_rule']
     source = module.params['source']
     zone = module.params['zone']
     target = module.params['target']
 
-    port = None
     if module.params['port'] is not None:
         if '/' in module.params['port']:
-            port, port_protocol = module.params['port'].strip().split('/')
+            port, protocol = module.params['port'].strip().split('/')
         else:
-            port_protocol = None
-        if not port_protocol:
+            protocol = None
+        if not protocol:
             module.fail_json(msg='improper port format (missing protocol?)')
     else:
-        port_protocol = None
+        port = None
 
     port_forward_toaddr = ''
     port_forward = None
@@ -882,11 +813,33 @@ def main():
         if 'toaddr' in port_forward:
             port_forward_toaddr = port_forward['toaddr']
 
-    modification = False
-    if any([icmp_block, icmp_block_inversion, service, protocol, port, port_forward, rich_rule,
-            interface, masquerade, source, target]):
-        modification = True
-    if modification and desired_state in ['absent', 'present'] and target is None:
+    modification_count = 0
+    if icmp_block is not None:
+        modification_count += 1
+    if icmp_block_inversion is not None:
+        modification_count += 1
+    if service is not None:
+        modification_count += 1
+    if port is not None:
+        modification_count += 1
+    if port_forward is not None:
+        modification_count += 1
+    if rich_rule is not None:
+        modification_count += 1
+    if interface is not None:
+        modification_count += 1
+    if masquerade is not None:
+        modification_count += 1
+    if source is not None:
+        modification_count += 1
+    if target is not None:
+        modification_count += 1
+
+    if modification_count > 1:
+        module.fail_json(
+            msg='can only operate on port, service, rich_rule, masquerade, icmp_block, icmp_block_inversion, interface or source at once'
+        )
+    elif (modification_count > 0) and (desired_state in ['absent', 'present']) and (target is None):
         module.fail_json(
             msg='absent and present state can only be used in zone level operations'
         )
@@ -908,21 +861,12 @@ def main():
             msgs.append("Changed icmp-block %s to %s" % (icmp_block, desired_state))
 
     if icmp_block_inversion is not None:
-        # Type of icmp_block_inversion will be changed to boolean in a future release.
-        icmp_block_inversion_status = True
-        try:
-            icmp_block_inversion_status = boolean(icmp_block_inversion, True)
-        except TypeError:
-            module.warn('The value of the icmp_block_inversion option is "%s". '
-                        'The type of the option will be changed from string to boolean in a future release. '
-                        'To avoid unexpected behavior, please change the value to boolean.' % icmp_block_inversion)
-        expected_state = 'enabled' if (desired_state == 'enabled') == icmp_block_inversion_status else 'disabled'
 
         transaction = IcmpBlockInversionTransaction(
             module,
             action_args=(),
             zone=zone,
-            desired_state=expected_state,
+            desired_state=desired_state,
             permanent=permanent,
             immediate=immediate,
         )
@@ -932,6 +876,14 @@ def main():
         if changed is True:
             msgs.append("Changed icmp-block-inversion %s to %s" % (icmp_block_inversion, desired_state))
 
+        # Type of icmp_block_inversion will be changed to boolean in a future release.
+        try:
+            boolean(icmp_block_inversion, True)
+        except TypeError:
+            module.warn('The value of the icmp_block_inversion option is "%s". '
+                        'The type of the option will be changed from string to boolean in a future release. '
+                        'To avoid unexpected behavior, please change the value to boolean.' % icmp_block_inversion)
+
     if service is not None:
 
         transaction = ServiceTransaction(
@@ -948,22 +900,6 @@ def main():
         if changed is True:
             msgs.append("Changed service %s to %s" % (service, desired_state))
 
-    if protocol is not None:
-
-        transaction = ProtocolTransaction(
-            module,
-            action_args=(protocol, timeout),
-            zone=zone,
-            desired_state=desired_state,
-            permanent=permanent,
-            immediate=immediate,
-        )
-
-        changed, transaction_msgs = transaction.run()
-        msgs = msgs + transaction_msgs
-        if changed is True:
-            msgs.append("Changed protocol %s to %s" % (protocol, desired_state))
-
     if source is not None:
 
         transaction = SourceTransaction(
@@ -982,7 +918,7 @@ def main():
 
         transaction = PortTransaction(
             module,
-            action_args=(port, port_protocol, timeout),
+            action_args=(port, protocol, timeout),
             zone=zone,
             desired_state=desired_state,
             permanent=permanent,
@@ -994,7 +930,7 @@ def main():
         if changed is True:
             msgs.append(
                 "Changed port %s to %s" % (
-                    "%s/%s" % (port, port_protocol), desired_state
+                    "%s/%s" % (port, protocol), desired_state
                 )
             )
 
@@ -1052,21 +988,12 @@ def main():
         msgs = msgs + transaction_msgs
 
     if masquerade is not None:
-        # Type of masquerade will be changed to boolean in a future release.
-        masquerade_status = True
-        try:
-            masquerade_status = boolean(masquerade, True)
-        except TypeError:
-            module.warn('The value of the masquerade option is "%s". '
-                        'The type of the option will be changed from string to boolean in a future release. '
-                        'To avoid unexpected behavior, please change the value to boolean.' % masquerade)
 
-        expected_state = 'enabled' if (desired_state == 'enabled') == masquerade_status else 'disabled'
         transaction = MasqueradeTransaction(
             module,
             action_args=(),
             zone=zone,
-            desired_state=expected_state,
+            desired_state=desired_state,
             permanent=permanent,
             immediate=immediate,
         )
@@ -1074,6 +1001,14 @@ def main():
         changed, transaction_msgs = transaction.run()
         msgs = msgs + transaction_msgs
 
+        # Type of masquerade will be changed to boolean in a future release.
+        try:
+            boolean(masquerade, True)
+        except TypeError:
+            module.warn('The value of the masquerade option is "%s". '
+                        'The type of the option will be changed from string to boolean in a future release. '
+                        'To avoid unexpected behavior, please change the value to boolean.' % masquerade)
+
     if target is not None:
 
         transaction = ZoneTargetTransaction(
@@ -1089,7 +1024,7 @@ def main():
         msgs = msgs + transaction_msgs
 
     ''' If there are no changes within the zone we are operating on the zone itself '''
-    if not modification and desired_state in ['absent', 'present']:
+    if modification_count == 0 and desired_state in ['absent', 'present']:
 
         transaction = ZoneTransaction(
             module,

plugins/modules/firewalld_info.py

@@ -17,7 +17,7 @@ options:
     active_zones:
         description: Gather information about active zones.
         type: bool
-        default: false
+        default: no
     zones:
         description:
             - Gather information about specific zones.
@@ -36,12 +36,7 @@ author:
 EXAMPLES = r'''
 - name: Gather information about active zones
   ansible.posix.firewalld_info:
-    active_zones: true
-  register: result
-
-- name: Print default zone for debugging
-  ansible.builtin.debug:
-    var: result.firewalld_info.default_zone
+    active_zones: yes
 
 - name: Gather information about specific zones
   ansible.posix.firewalld_info:
@@ -49,7 +44,6 @@ EXAMPLES = r'''
       - public
       - external
       - internal
-  register: result
 '''
 
 RETURN = r'''
@@ -84,7 +78,7 @@ firewalld_info:
             returned: success
             type: str
             sample: 0.8.2
-        default_zone:
+        default_zones:
             description:
               - The zone name of default zone.
             returned: success
@@ -211,7 +205,7 @@ firewalld_info:
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
 from ansible.module_utils._text import to_native
-from ansible_collections.ansible.posix.plugins.module_utils.version import StrictVersion
+from distutils.version import StrictVersion
 
 
 try:

plugins/modules/mount.py

@@ -31,12 +31,12 @@ options:
   src:
     description:
       - Device (or NFS volume, or something else) to be mounted on I(path).
-      - Required when I(state) set to C(present), C(mounted) or C(ephemeral).
+      - Required when I(state) set to C(present) or C(mounted).
     type: path
   fstype:
     description:
       - Filesystem type.
-      - Required when I(state) is C(present), C(mounted) or C(ephemeral).
+      - Required when I(state) is C(present) or C(mounted).
     type: str
   opts:
     description:
@@ -48,18 +48,18 @@ options:
       - Note that if set to C(null) and I(state) set to C(present),
         it will cease to work and duplicate entries will be made
         with subsequent runs.
-      - Has no effect on Solaris systems or when used with C(ephemeral).
+      - Has no effect on Solaris systems.
     type: str
-    default: '0'
+    default: 0
   passno:
     description:
       - Passno (see fstab(5)).
       - Note that if set to C(null) and I(state) set to C(present),
         it will cease to work and duplicate entries will be made
         with subsequent runs.
-      - Deprecated on Solaris systems. Has no effect when used with C(ephemeral).
+      - Deprecated on Solaris systems.
     type: str
-    default: '0'
+    default: 0
   state:
     description:
       - If C(mounted), the device will be actively mounted and appropriately
@@ -68,13 +68,6 @@ options:
       - If C(unmounted), the device will be unmounted without changing I(fstab).
       - C(present) only specifies that the device is to be configured in
         I(fstab) and does not trigger or require a mount.
-      - C(ephemeral) only specifies that the device is to be mounted, without changing
-        I(fstab). If it is already mounted, a remount will be triggered.
-        This will always return changed=True. If the mount point I(path)
-        has already a device mounted on, and its source is different than I(src),
-        the module will fail to avoid unexpected unmount or mount point override.
-        If the mount point is not present, the mount point will be created.
-        The I(fstab) is completely ignored. This option is added in version 1.5.0.
       - C(absent) specifies that the device mount's entry will be removed from
         I(fstab) and will also unmount the device and remove the mount
         point.
@@ -84,15 +77,10 @@ options:
         applied to the remount, but will not change I(fstab).  Additionally,
         if I(opts) is set, and the remount command fails, the module will
         error to prevent unexpected mount changes.  Try using C(mounted)
-        instead to work around this issue.  C(remounted) expects the mount point
-        to be present in the I(fstab). To remount a mount point not registered
-        in I(fstab), use C(ephemeral) instead, especially with BSD nodes.
-      - C(absent_from_fstab) specifies that the device mount's entry will be
-        removed from I(fstab). This option does not unmount it or delete the
-        mountpoint.
+        instead to work around this issue.
     type: str
     required: true
-    choices: [ absent, absent_from_fstab, mounted, present, unmounted, remounted, ephemeral ]
+    choices: [ absent, mounted, present, unmounted, remounted ]
   fstab:
     description:
       - File to use instead of C(/etc/fstab).
@@ -101,7 +89,6 @@ options:
       - OpenBSD does not allow specifying alternate fstab files with mount so do not
         use this on OpenBSD with any state that operates on the live filesystem.
       - This parameter defaults to /etc/fstab or /etc/vfstab on Solaris.
-      - This parameter is ignored when I(state) is set to C(ephemeral).
     type: str
   boot:
     description:
@@ -113,15 +100,14 @@ options:
         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).
-      - This parameter is ignored when I(state) is set to C(ephemeral).
     type: bool
-    default: true
+    default: yes
   backup:
     description:
       - Create a backup file including the timestamp information so you can get
         the original file back if you somehow clobbered it incorrectly.
     type: bool
-    default: false
+    default: no
 notes:
   - As of Ansible 2.3, the I(name) option has been changed to I(path) as
     default, but I(name) still works as well.
@@ -186,7 +172,7 @@ EXAMPLES = r'''
   ansible.posix.mount:
     src: 192.168.1.100:/nfs/ssd/shared_data
     path: /mnt/shared_data
-    opts: rw,sync,hard
+    opts: rw,sync,hard,intr
     state: mounted
     fstype: nfs
 
@@ -194,18 +180,10 @@ EXAMPLES = r'''
   ansible.posix.mount:
     src: 192.168.1.100:/nfs/ssd/shared_data
     path: /mnt/shared_data
-    opts: rw,sync,hard
-    boot: false
+    opts: rw,sync,hard,intr
+    boot: no
     state: mounted
     fstype: nfs
-
-- name: Mount ephemeral SMB volume
-  ansible.posix.mount:
-    src: //192.168.1.200/share
-    path: /mnt/smb_share
-    opts: "rw,vers=3,file_mode=0600,dir_mode=0700,dom={{ ad_domain }},username={{ ad_username }},password={{ ad_password }}"
-    fstype: cifs
-    state: ephemeral
 '''
 
 import errno
@@ -248,7 +226,7 @@ def _escape_fstab(v):
     if isinstance(v, int):
         return v
     else:
-        return (
+        return(
             v.
             replace('\\', '\\134').
             replace(' ', '\\040').
@@ -452,24 +430,6 @@ def _set_fstab_args(fstab_file):
     return result
 
 
-def _set_ephemeral_args(args):
-    result = []
-    # Set fstype switch according to platform. SunOS/Solaris use -F
-    if platform.system().lower() == 'sunos':
-        result.append('-F')
-    else:
-        result.append('-t')
-    result.append(args['fstype'])
-
-    # Even if '-o remount' is already set, specifying multiple -o is valid
-    if args['opts'] != 'defaults':
-        result += ['-o', args['opts']]
-
-    result.append(args['src'])
-
-    return result
-
-
 def mount(module, args):
     """Mount up a path or remount if needed."""
 
@@ -486,11 +446,7 @@ def mount(module, args):
                     'OpenBSD does not support alternate fstab files. Do not '
                     'specify the fstab parameter for OpenBSD hosts'))
     else:
-        if module.params['state'] != 'ephemeral':
-            cmd += _set_fstab_args(args['fstab'])
-
-    if module.params['state'] == 'ephemeral':
-        cmd += _set_ephemeral_args(args)
+        cmd += _set_fstab_args(args['fstab'])
 
     cmd += [name]
 
@@ -542,24 +498,18 @@ def remount(module, args):
                     'OpenBSD does not support alternate fstab files. Do not '
                     'specify the fstab parameter for OpenBSD hosts'))
     else:
-        if module.params['state'] != 'ephemeral':
-            cmd += _set_fstab_args(args['fstab'])
-
-    if module.params['state'] == 'ephemeral':
-        cmd += _set_ephemeral_args(args)
+        cmd += _set_fstab_args(args['fstab'])
 
     cmd += [args['name']]
     out = err = ''
 
     try:
-        if module.params['state'] != 'ephemeral' and platform.system().lower().endswith('bsd'):
+        if platform.system().lower().endswith('bsd'):
             # Note: Forcing BSDs to do umount/mount due to BSD remount not
             # working as expected (suspect bug in the BSD mount command)
             # Interested contributor could rework this to use mount options on
             # the CLI instead of relying on fstab
             # https://github.com/ansible/ansible-modules-core/issues/5591
-            # Note: this does not affect ephemeral state as all options
-            # are set on the CLI and fstab is expected to be ignored.
             rc = 1
         else:
             rc, out, err = module.run_command(cmd)
@@ -713,66 +663,24 @@ def get_linux_mounts(module, mntinfo_file="/proc/self/mountinfo"):
     return mounts
 
 
-def _is_same_mount_src(module, src, mountpoint, linux_mounts):
-    """Return True if the mounted fs on mountpoint is the same source than src. Return False if mountpoint is not a mountpoint"""
-    # If the provided mountpoint is not a mountpoint, don't waste time
-    if (
-            not ismount(mountpoint) and
-            not is_bind_mounted(module, linux_mounts, mountpoint)):
-        return False
-
-    # Treat Linux bind mounts
-    if platform.system() == 'Linux' and linux_mounts is not None:
-        # For Linux bind mounts only: the mount command does not return
-        # the actual source for bind mounts, but the device of the source.
-        # is_bind_mounted() called with the 'src' parameter will return True if
-        # the mountpoint is a bind mount AND the source FS is the same than 'src'.
-        # is_bind_mounted() is not reliable on Solaris, NetBSD and OpenBSD.
-        # But we can rely on 'mount -v' on all other platforms, and Linux non-bind mounts.
-        if is_bind_mounted(module, linux_mounts, mountpoint, src):
-            return True
-
-    # mount with parameter -v has a close behavior on Linux, *BSD, SunOS
-    # Requires -v with SunOS. Without -v, source and destination are reversed
-    # Output format differs from a system to another, but field[0:3] are consistent: [src, 'on', dest]
-    cmd = '%s -v' % module.get_bin_path('mount', required=True)
-    rc, out, err = module.run_command(cmd)
-    mounts = []
-
-    if len(out):
-        mounts = to_native(out).strip().split('\n')
-    else:
-        module.fail_json(msg="Unable to retrieve mount info with command '%s'" % cmd)
-
-    for mnt in mounts:
-        fields = mnt.split()
-        mp_src = fields[0]
-        mp_dst = fields[2]
-        if mp_src == src and mp_dst == mountpoint:
-            return True
-
-    return False
-
-
 def main():
     module = AnsibleModule(
         argument_spec=dict(
             boot=dict(type='bool', default=True),
-            dump=dict(type='str', default='0'),
+            dump=dict(type='str'),
             fstab=dict(type='str'),
             fstype=dict(type='str'),
             path=dict(type='path', required=True, aliases=['name']),
             opts=dict(type='str'),
-            passno=dict(type='str', no_log=False, default='0'),
+            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', 'absent_from_fstab', 'mounted', 'present', 'unmounted', 'remounted', 'ephemeral']),
+            state=dict(type='str', required=True, choices=['absent', 'mounted', 'present', 'unmounted', 'remounted']),
         ),
         supports_check_mode=True,
         required_if=(
             ['state', 'mounted', ['src', 'fstype']],
             ['state', 'present', ['src', 'fstype']],
-            ['state', 'ephemeral', ['src', 'fstype']]
         ),
     )
 
@@ -843,17 +751,15 @@ def main():
 
     # If fstab file does not exist, we first need to create it. This mainly
     # happens when fstab option is passed to the module.
-    # If state is 'ephemeral', we do not need fstab file
-    if module.params['state'] != 'ephemeral':
-        if not os.path.exists(args['fstab']):
-            if not os.path.exists(os.path.dirname(args['fstab'])):
-                os.makedirs(os.path.dirname(args['fstab']))
-            try:
-                open(args['fstab'], 'a').close()
-            except PermissionError as e:
-                module.fail_json(msg="Failed to open %s due to permission issue" % args['fstab'])
-            except Exception as e:
-                module.fail_json(msg="Failed to open %s due to %s" % (args['fstab'], to_native(e)))
+    if not os.path.exists(args['fstab']):
+        if not os.path.exists(os.path.dirname(args['fstab'])):
+            os.makedirs(os.path.dirname(args['fstab']))
+        try:
+            open(args['fstab'], 'a').close()
+        except PermissionError as e:
+            module.fail_json(msg="Failed to open %s due to permission issue" % args['fstab'])
+        except Exception as e:
+            module.fail_json(msg="Failed to open %s due to %s" % (args['fstab'], to_native(e)))
 
     # absent:
     #   Remove from fstab and unmounted.
@@ -864,16 +770,12 @@ def main():
     # mounted:
     #   Add to fstab if not there and make sure it is mounted. If it has
     #   changed in fstab then remount it.
-    # ephemeral:
-    #   Do not change fstab state, but mount.
 
     state = module.params['state']
     name = module.params['path']
     changed = False
 
-    if state == 'absent_from_fstab':
-        name, changed = unset_mount(module, args)
-    elif state == 'absent':
+    if state == 'absent':
         name, changed = unset_mount(module, args)
 
         if changed and not module.check_mode:
@@ -899,7 +801,7 @@ def main():
                         msg="Error unmounting %s: %s" % (name, msg))
 
             changed = True
-    elif state == 'mounted' or state == 'ephemeral':
+    elif state == 'mounted':
         dirs_created = []
         if not os.path.exists(name) and not module.check_mode:
             try:
@@ -927,11 +829,7 @@ def main():
                 module.fail_json(
                     msg="Error making dir %s: %s" % (name, to_native(e)))
 
-        # ephemeral: completely ignore fstab
-        if state != 'ephemeral':
-            name, backup_lines, changed = _set_mount_save_old(module, args)
-        else:
-            name, backup_lines, changed = args['name'], [], False
+        name, backup_lines, changed = _set_mount_save_old(module, args)
         res = 0
 
         if (
@@ -941,26 +839,7 @@ def main():
             if changed and not module.check_mode:
                 res, msg = remount(module, args)
                 changed = True
-
-            # When 'state' == 'ephemeral', we don't know what is in fstab, and 'changed' is always False
-            if state == 'ephemeral':
-                # If state == 'ephemeral', check if the mountpoint src == module.params['src']
-                # If it doesn't, fail to prevent unwanted unmount or unwanted mountpoint override
-                if _is_same_mount_src(module, args['src'], args['name'], linux_mounts):
-                    changed = True
-                    if not module.check_mode:
-                        res, msg = remount(module, args)
-                else:
-                    module.fail_json(
-                        msg=(
-                            'Ephemeral mount point is already mounted with a different '
-                            'source than the specified one. Failing in order to prevent an '
-                            'unwanted unmount or override operation. Try replacing this command with '
-                            'a "state: unmounted" followed by a "state: ephemeral", or use '
-                            'a different destination path.'))
-
         else:
-            # If not already mounted, mount it
             changed = True
 
             if not module.check_mode:
@@ -972,8 +851,7 @@ def main():
             # A non-working fstab entry may break the system at the reboot,
             # so undo all the changes if possible.
             try:
-                if state != 'ephemeral':
-                    write_fstab(module, backup_lines, args['fstab'])
+                write_fstab(module, backup_lines, args['fstab'])
             except Exception:
                 pass
 

plugins/modules/patch.py

@@ -37,7 +37,7 @@ options:
   src:
     description:
       - Path of the patch file as accepted by the GNU patch tool. If
-        C(remote_src) is C(false), the patch source file is looked up from the
+        C(remote_src) is 'no', the patch source file is looked up from the
         module's I(files) directory.
     type: path
     required: true
@@ -50,10 +50,10 @@ options:
     default: present
   remote_src:
     description:
-      - If C(false), it will search for src at originating/controller machine, if C(true) it will
+      - If C(no), it will search for src at originating/controller machine, if C(yes) it will
         go to the remote/target machine for the C(src).
     type: bool
-    default: false
+    default: no
   strip:
     description:
       - Number that indicates the smallest prefix containing leading slashes
@@ -65,20 +65,20 @@ options:
     description:
       - Passes C(--backup --version-control=numbered) to patch, producing numbered backup copies.
     type: bool
-    default: false
+    default: no
   binary:
     description:
-      - Setting to C(true) will disable patch's heuristic for transforming CRLF
+      - Setting to C(yes) will disable patch's heuristic for transforming CRLF
         line endings into LF.
       - Line endings of src and dest must match.
-      - If set to C(false), C(patch) will replace CRLF in C(src) files on POSIX.
+      - If set to C(no), C(patch) will replace CRLF in C(src) files on POSIX.
     type: bool
-    default: false
+    default: no
   ignore_whitespace:
     description:
-      - Setting to C(true) will ignore white space changes between patch and input.
+      - Setting to C(yes) will ignore white space changes between patch and input..
     type: bool
-    default: false
+    default: no
 notes:
   - This module requires GNU I(patch) utility to be installed on the remote host.
 '''

plugins/modules/rhel_facts.py

@@ -1,76 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: Red Hat Inc.
-# 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 = '''
----
-module: rhel_facts
-version_added: 1.5.0
-short_description: Facts module to set or override RHEL specific facts.
-description:
-  - Compatibility layer for using the "package" module for rpm-ostree based systems via setting the "pkg_mgr" fact correctly.
-author:
-  - Adam Miller (@maxamillion)
-requirements:
-  - rpm-ostree
-seealso:
-  - module: ansible.builtin.package
-options: {}
-'''
-
-EXAMPLES = '''
-- name: Playbook to use the package module on all RHEL footprints
-  vars:
-    ansible_facts_modules:
-      - setup # REQUIRED to be run before all custom fact modules
-      - ansible.posix.rhel_facts
-  tasks:
-    - name: Ensure packages are installed
-      ansible.builtin.package:
-        name:
-          - htop
-          - ansible
-        state: present
-'''
-
-RETURN = """
-ansible_facts:
-    description: Relevant Ansible Facts
-    returned: when needed
-    type: complex
-    contains:
-        pkg_mgr:
-            description: System-level package manager override
-            returned: when needed
-            type: str
-            sample: {'pkg_mgr': 'ansible.posix.rhel_facts'}
-"""
-
-import os
-
-from ansible.module_utils.basic import AnsibleModule
-
-
-def main():
-
-    module = AnsibleModule(
-        argument_spec=dict(),
-        supports_check_mode=True,
-    )
-
-    ansible_facts = {}
-
-    # Verify that the platform is an rpm-ostree based system
-    if os.path.exists("/run/ostree-booted"):
-        ansible_facts['pkg_mgr'] = 'ansible.posix.rhel_rpm_ostree'
-
-    module.exit_json(ansible_facts=ansible_facts, changed=False)
-
-
-if __name__ == '__main__':
-    main()

plugins/modules/rhel_rpm_ostree.py

@@ -1,124 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: Red Hat Inc.
-# 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
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-DOCUMENTATION = '''
----
-module: rhel_rpm_ostree
-version_added: 1.5.0
-short_description: Ensure packages exist in a RHEL for Edge rpm-ostree based system
-description:
-  - Compatibility layer for using the "package" module for RHEL for Edge systems utilizing the RHEL System Roles.
-author:
-  - Adam Miller (@maxamillion)
-requirements:
-  - rpm-ostree
-options:
-  name:
-    description:
-      - A package name or package specifier with version, like C(name-1.0).
-      - Comparison operators for package version are valid here C(>), C(<), C(>=), C(<=). Example - C(name>=1.0)
-      - If a previous version is specified, the task also needs to turn C(allow_downgrade) on.
-        See the C(allow_downgrade) documentation for caveats with downgrading packages.
-      - When using state=latest, this can be C('*') which means run C(yum -y update).
-      - You can also pass a url or a local path to a rpm file (using state=present).
-        To operate on several packages this can accept a comma separated string of packages or (as of 2.0) a list of packages.
-    aliases: [ pkg ]
-    type: list
-    elements: str
-    default: []
-  state:
-    description:
-      - Whether to install (C(present) or C(installed), C(latest)), or remove (C(absent) or C(removed)) a package.
-      - C(present) and C(installed) will simply ensure that a desired package is installed.
-      - C(latest) will update the specified package if it's not of the latest available version.
-      - C(absent) and C(removed) will remove the specified package.
-      - Default is C(None), however in effect the default action is C(present) unless the C(autoremove) option is
-        enabled for this module, then C(absent) is inferred.
-    type: str
-    choices: [ absent, installed, latest, present, removed ]
-notes:
-  - This module does not support installing or removing packages to/from an overlay as this is not supported
-    by RHEL for Edge, packages needed should be defined in the osbuild Blueprint and provided to Image Builder
-    at build time. This module exists only for C(package) module compatibility.
-'''
-
-EXAMPLES = '''
-- name: Ensure htop and ansible are installed on rpm-ostree based RHEL
-  ansible.posix.rhel_rpm_ostree:
-    name:
-      - htop
-      - ansible
-    state: present
-'''
-
-RETURN = """
-msg:
-    description: status of rpm transaction
-    returned: always
-    type: str
-    sample: "No changes made."
-"""
-
-import os
-import traceback
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils._text import to_text
-
-
-def locally_installed(module, pkgname):
-    (rc, out, err) = module.run_command('{0} -q {1}'.format(module.get_bin_path("rpm"), pkgname).split())
-    return (rc == 0)
-
-
-def rpm_ostree_transaction(module):
-    pkgs = []
-
-    if module.params['state'] in ['present', 'installed', 'latest']:
-        for pkg in module.params['name']:
-            if not locally_installed(module, pkg):
-                pkgs.append(pkg)
-    elif module.params['state'] in ['absent', 'removed']:
-        for pkg in module.params['name']:
-            if locally_installed(module, pkg):
-                pkgs.append(pkg)
-
-    if not pkgs:
-        module.exit_json(msg="No changes made.")
-    else:
-        if module.params['state'] in ['present', 'installed', 'latest']:
-            module.fail_json(msg="The following packages are absent in the currently booted rpm-ostree commit: %s" ' '.join(pkgs))
-        else:
-            module.fail_json(msg="The following packages are present in the currently booted rpm-ostree commit: %s" ' '.join(pkgs))
-
-
-def main():
-    module = AnsibleModule(
-        argument_spec=dict(
-            name=dict(type='list', elements='str', aliases=['pkg'], default=[]),
-            state=dict(type='str', default=None, choices=['absent', 'installed', 'latest', 'present', 'removed']),
-        ),
-    )
-
-    # Verify that the platform is an rpm-ostree based system
-    if not os.path.exists("/run/ostree-booted"):
-        module.fail_json(msg="Module rpm_ostree is only applicable for rpm-ostree based systems.")
-
-    try:
-        rpm_ostree_transaction(module)
-    except Exception as e:
-        module.fail_json(msg=to_text(e), exception=traceback.format_exc())
-
-
-if __name__ == '__main__':
-    main()

plugins/modules/rpm_ostree_upgrade.py

@@ -1,125 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: Red Hat Inc.
-# 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
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-DOCUMENTATION = '''
----
-module: rpm_ostree_upgrade
-short_description: Manage rpm-ostree upgrade transactions
-description:
-    - Manage an rpm-ostree upgrade transactions.
-version_added: 1.5.0
-author:
-- Adam Miller (@maxamillion)
-requirements:
-  - rpm-ostree
-options:
-    os:
-        description:
-            - The OSNAME upon which to operate.
-        type: str
-        default: ""
-        required: false
-    cache_only:
-        description:
-          - Perform the transaction using only pre-cached data, do not download.
-        type: bool
-        default: false
-        required: false
-    allow_downgrade:
-        description:
-            - Allow for the upgrade to be a chronologically older tree.
-        type: bool
-        default: false
-        required: false
-    peer:
-        description:
-            - Force peer-to-peer connection instead of using a system message bus.
-        type: bool
-        default: false
-        required: false
-
-'''
-
-EXAMPLES = '''
-- name: Upgrade the rpm-ostree image without options, accept all defaults
-  ansible.posix.rpm_ostree_upgrade:
-
-- name: Upgrade the rpm-ostree image allowing downgrades
-  ansible.posix.rpm_ostree_upgrade:
-    allow_downgrade: true
-'''
-
-RETURN = '''
-msg:
-    description: The command standard output
-    returned: always
-    type: str
-    sample: 'No upgrade available.'
-'''
-
-import os
-import traceback
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils._text import to_native, to_text
-
-
-def rpm_ostree_transaction(module):
-    cmd = []
-    cmd.append(module.get_bin_path("rpm-ostree"))
-    cmd.append('upgrade')
-
-    if module.params['os']:
-        cmd += ['--os', module.params['os']]
-    if module.params['cache_only']:
-        cmd += ['--cache-only']
-    if module.params['allow_downgrade']:
-        cmd += ['--allow-downgrade']
-    if module.params['peer']:
-        cmd += ['--peer']
-
-    module.run_command_environ_update = dict(LANG='C', LC_ALL='C', LC_MESSAGES='C')
-
-    rc, out, err = module.run_command(cmd)
-
-    if rc != 0:
-        module.fail_json(rc=rc, msg=err)
-    else:
-        if to_text("No upgrade available.") in to_text(out):
-            module.exit_json(msg=out, changed=False)
-        else:
-            module.exit_json(msg=out, changed=True)
-
-
-def main():
-    module = AnsibleModule(
-        argument_spec=dict(
-            os=dict(type='str', default=''),
-            cache_only=dict(type='bool', default=False),
-            allow_downgrade=dict(type='bool', default=False),
-            peer=dict(type='bool', default=False),
-        ),
-    )
-
-    # Verify that the platform is an rpm-ostree based system
-    if not os.path.exists("/run/ostree-booted"):
-        module.fail_json(msg="Module rpm_ostree_upgrade is only applicable for rpm-ostree based systems.")
-
-    try:
-        rpm_ostree_transaction(module)
-    except Exception as e:
-        module.fail_json(msg=to_native(e), exception=traceback.format_exc())
-
-
-if __name__ == '__main__':
-    main()

plugins/modules/seboolean.py

@@ -22,9 +22,9 @@ options:
     type: str
   persistent:
     description:
-      - Set to C(true) if the boolean setting should survive a reboot.
+      - Set to C(yes) if the boolean setting should survive a reboot.
     type: bool
-    default: false
+    default: 'no'
   state:
     description:
       - Desired boolean value
@@ -40,7 +40,6 @@ notes:
 requirements:
 - libselinux-python
 - libsemanage-python
-- python3-libsemanage
 author:
 - Stephen Fromm (@sfromm)
 '''
@@ -49,8 +48,8 @@ EXAMPLES = r'''
 - name: Set httpd_can_network_connect flag on and keep it persistent across reboots
   ansible.posix.seboolean:
     name: httpd_can_network_connect
-    state: true
-    persistent: true
+    state: yes
+    persistent: yes
 '''
 
 import os
@@ -285,7 +284,7 @@ def main():
         module.fail_json(msg=missing_required_lib('libselinux-python'), exception=SELINUX_IMP_ERR)
 
     if not HAVE_SEMANAGE:
-        module.fail_json(msg=missing_required_lib('libsemanage-python or python3-libsemanage'), exception=SEMANAGE_IMP_ERR)
+        module.fail_json(msg=missing_required_lib('libsemanage-python'), exception=SEMANAGE_IMP_ERR)
 
     ignore_selinux_state = module.params['ignore_selinux_state']
 

plugins/modules/selinux.py

@@ -32,7 +32,7 @@ options:
     description:
       - If set to I(true), will update also the kernel boot parameters when disabling/enabling SELinux.
       - The C(grubby) tool must be present on the target system for this to work.
-    default: false
+    default: no
     type: bool
     version_added: '1.4.0'
   configfile:

plugins/modules/synchronize.py

@@ -52,36 +52,36 @@ options:
     description:
       - Mirrors the rsync archive flag, enables recursive, links, perms, times, owner, group flags and -D.
     type: bool
-    default: true
+    default: yes
   checksum:
     description:
       - Skip based on checksum, rather than mod-time & size; Note that that "archive" option is still enabled by default - the "checksum" option will
         not disable it.
     type: bool
-    default: false
+    default: no
   compress:
     description:
       - Compress file data during the transfer.
       - In most cases, leave this enabled unless it causes problems.
     type: bool
-    default: true
+    default: yes
   existing_only:
     description:
       - Skip creating new files on receiver.
     type: bool
-    default: false
+    default: no
   delete:
     description:
       - Delete files in I(dest) that do not exist (after transfer, not before) in the I(src) path.
-      - This option requires I(recursive=true).
+      - This option requires I(recursive=yes).
       - This option ignores excluded files and behaves like the rsync opt C(--delete-after).
     type: bool
-    default: false
+    default: no
   dirs:
     description:
       - Transfer directories without recursing.
     type: bool
-    default: false
+    default: no
   recursive:
     description:
       - Recurse into directories.
@@ -96,7 +96,7 @@ options:
     description:
       - Copy symlinks as the item that they point to (the referent) is copied, rather than the symlink.
     type: bool
-    default: false
+    default: no
   perms:
     description:
       - Preserve permissions.
@@ -131,26 +131,26 @@ options:
     description:
       - Put user@ for the remote paths.
       - If you have a custom ssh config to define the remote user for a host
-        that does not match the inventory user, you should set this parameter to C(false).
+        that does not match the inventory user, you should set this parameter to C(no).
     type: bool
-    default: true
+    default: yes
   use_ssh_args:
     description:
       - 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: false
+    default: no
   ssh_connection_multiplexing:
     description:
       - 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 C(ControlSocket) to C(none).
-      - Set this option to C(true) to allow multiplexing and reduce SSH connection overhead.
-      - Note that simply setting this option to C(true) is not enough;
+      - Set this option to C(yes) to allow multiplexing and reduce SSH connection overhead.
+      - Note that simply setting this option to C(yes) is not enough;
         You must also configure SSH connection multiplexing in your SSH client config by setting values for
         C(ControlMaster), C(ControlPersist) and C(ControlPath).
     type: bool
-    default: false
+    default: no
   rsync_opts:
     description:
       - Specify additional rsync options by passing in an array.
@@ -162,12 +162,12 @@ options:
     description:
       - Tells rsync to keep the partial file which should make a subsequent transfer of the rest of the file much faster.
     type: bool
-    default: false
+    default: no
   verify_host:
     description:
       - Verify destination host key.
     type: bool
-    default: false
+    default: no
   private_key:
     description:
       - Specify the private key to use for SSH-based rsync connections (e.g. C(~/.ssh/id_rsa)).
@@ -183,7 +183,7 @@ options:
       - 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: true
+    default: yes
     version_added: '1.3.0'
   quiet:
     description:
@@ -217,7 +217,7 @@ notes:
    - 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:
-- module: ansible.builtin.copy
+- module: copy
 - module: community.windows.win_robocopy
 author:
 - Timothy Appnel (@tima)
@@ -257,27 +257,27 @@ EXAMPLES = r'''
   ansible.posix.synchronize:
     src: some/relative/path
     dest: /some/absolute/path
-    archive: false
+    archive: no
 
 - name: Synchronization with --archive options enabled except for --recursive
   ansible.posix.synchronize:
     src: some/relative/path
     dest: /some/absolute/path
-    recursive: false
+    recursive: no
 
 - name: Synchronization with --archive options enabled except for --times, with --checksum option enabled
   ansible.posix.synchronize:
     src: some/relative/path
     dest: /some/absolute/path
-    checksum: true
-    times: false
+    checksum: yes
+    times: no
 
 - name: Synchronization without --archive options enabled except use --links
   ansible.posix.synchronize:
     src: some/relative/path
     dest: /some/absolute/path
-    archive: false
-    links: true
+    archive: no
+    links: yes
 
 - name: Synchronization of two paths both on the control machine
   ansible.posix.synchronize:
@@ -307,8 +307,8 @@ EXAMPLES = r'''
   ansible.posix.synchronize:
     src: some/relative/path
     dest: /some/absolute/path
-    delete: true
-    recursive: true
+    delete: yes
+    recursive: yes
 
 # This specific command is granted su privileges on the destination
 - name: Synchronize using an alternate rsync command
@@ -600,11 +600,8 @@ def main():
     if '@' not in dest:
         dest = os.path.expanduser(dest)
 
-    cmd.append(shlex_quote(source))
-    cmd.append(shlex_quote(dest))
-    if quiet:
-        cmd.append('--quiet')
-
+    cmd.append(source)
+    cmd.append(dest)
     cmdstr = ' '.join(cmd)
 
     # If we are using password authentication, write the password into the pipe

plugins/modules/sysctl.py

@@ -38,14 +38,14 @@ options:
         description:
             - Use this option to ignore errors about unknown keys.
         type: bool
-        default: false
+        default: 'no'
     reload:
         description:
-            - If C(true), performs a I(/sbin/sysctl -p) if the C(sysctl_file) is
-              updated. If C(false), does not reload I(sysctl) even if the
+            - If C(yes), performs a I(/sbin/sysctl -p) if the C(sysctl_file) is
+              updated. If C(no), does not reload I(sysctl) even if the
               C(sysctl_file) is updated.
         type: bool
-        default: true
+        default: 'yes'
     sysctl_file:
         description:
             - Specifies the absolute path to C(sysctl.conf), if not C(/etc/sysctl.conf).
@@ -53,9 +53,9 @@ options:
         type: path
     sysctl_set:
         description:
-            - Verify token value with the sysctl command and set with -w if necessary.
+            - Verify token value with the sysctl command and set with -w if necessary
         type: bool
-        default: false
+        default: 'no'
 author:
 - David CHANIAL (@davixx)
 '''
@@ -78,21 +78,21 @@ EXAMPLES = r'''
     name: kernel.panic
     value: '3'
     sysctl_file: /tmp/test_sysctl.conf
-    reload: false
+    reload: no
 
 # Set ip forwarding on in /proc and verify token value with the sysctl command
 - ansible.posix.sysctl:
     name: net.ipv4.ip_forward
     value: '1'
-    sysctl_set: true
+    sysctl_set: yes
 
 # Set ip forwarding on in /proc and in the sysctl file and reload if necessary
 - ansible.posix.sysctl:
     name: net.ipv4.ip_forward
     value: '1'
-    sysctl_set: true
+    sysctl_set: yes
     state: present
-    reload: true
+    reload: yes
 '''
 
 # ==============================================================

plugins/shell/csh.py

@@ -4,8 +4,13 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from ansible.module_utils.six import text_type
+from ansible.module_utils.six.moves import shlex_quote
+from ansible.plugins.shell import ShellBase
+
 DOCUMENTATION = '''
     name: csh
+    plugin_type: shell
     short_description: C shell (/bin/csh)
     description:
       - When you have no other option than to use csh
@@ -13,10 +18,6 @@ DOCUMENTATION = '''
       - shell_common
 '''
 
-from ansible.module_utils.six import text_type
-from ansible.module_utils.six.moves import shlex_quote
-from ansible.plugins.shell import ShellBase
-
 
 class ShellModule(ShellBase):
 

plugins/shell/fish.py

@@ -4,8 +4,13 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from ansible.module_utils.six import text_type
+from ansible.module_utils.six.moves import shlex_quote
+from ansible.plugins.shell.sh import ShellModule as ShModule
+
 DOCUMENTATION = '''
     name: fish
+    plugin_type: shell
     short_description: fish shell (/bin/fish)
     description:
       - This is here because some people are restricted to fish.
@@ -13,10 +18,6 @@ DOCUMENTATION = '''
       - shell_common
 '''
 
-from ansible.module_utils.six import text_type
-from ansible.module_utils.six.moves import shlex_quote
-from ansible.plugins.shell.sh import ShellModule as ShModule
-
 
 class ShellModule(ShModule):
 

shippable.yml

@@ -15,7 +15,7 @@ matrix:
     - env: T=2.9/freebsd/12.0/1
     - env: T=2.9/linux/centos6/1
     - env: T=2.9/linux/centos7/1
-#    - env: T=2.9/linux/centos8/1
+    - env: T=2.9/linux/centos8/1
     - env: T=2.9/linux/fedora30/1
     - env: T=2.9/linux/fedora31/1
     - env: T=2.9/linux/opensuse15py2/1
@@ -30,7 +30,7 @@ matrix:
     - env: T=2.10/freebsd/12.1/1
     - env: T=2.10/linux/centos6/1
     - env: T=2.10/linux/centos7/1
-#    - env: T=2.10/linux/centos8/1
+    - env: T=2.10/linux/centos8/1
     - env: T=2.10/linux/fedora30/1
     - env: T=2.10/linux/fedora31/1
     - env: T=2.10/linux/opensuse15py2/1
@@ -45,7 +45,7 @@ matrix:
     - env: T=devel/freebsd/12.1/1
     - env: T=devel/linux/centos6/1
     - env: T=devel/linux/centos7/1
-#    - env: T=devel/linux/centos8/1
+    - env: T=devel/linux/centos8/1
     - env: T=devel/linux/fedora30/1
     - env: T=devel/linux/fedora31/1
     - env: T=devel/linux/opensuse15py2/1

tests/integration/requirements.yml

@@ -1,3 +0,0 @@
----
-collections:
-- community.general

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

@@ -17,7 +17,7 @@
 
 - block:
 
-  - include_tasks: acl.yml
+  - include: acl.yml
     when: ansible_system == 'Linux'  # TODO enable acls mount option on FreeBSD to test it there too
 
   always:

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

@@ -1,14 +1,5 @@
 # -------------------------------------------------------------
 # Setup steps
-- name: Clean up the working directory and files
-  file:
-    path: '{{ output_dir }}'
-    state: absent
-
-- name: Create the working directory
-  file:
-    path: '{{ output_dir }}'
-    state: directory
 
 - name: copy an existing file in place with comments
   copy:

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

@@ -1,172 +0,0 @@
-# Test playbook for the firewalld module - icmp block inversion operations
-# (c) 2022, Gregory Furlong <gnfzdz@fzdz.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-- name: Icmp block inversion enabled when icmp block inversion is truthy and state is enabled
-  block:
-  - name: Testing enable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: yes
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: yes
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Icmp block inversion disabled when icmp block inversion is falsy and state is enabled
-  block:
-  - name: Testing disable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: no
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: no
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Icmp block inversion enabled when icmp block inversion is falsy and state is disabled
-  block:
-  - name: Testing enable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: no
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: no
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Icmp block inversion disabled when icmp block inversion is truthy and state is disabled
-  block:
-  - name: Testing disable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: yes
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: yes
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-# Validate backwards compatible behavior until icmp block inversion is switched from string to boolean type
-- name: Icmp block inversion enabled when icmp block inversion is non-boolean string and state is enabled
-  block:
-  - name: Testing enable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: 'some string'
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: 'some string'
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert icmp block inversion is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Icmp block inversion disabled when icmp block inversion is non-boolean string and state is disabled
-  block:
-  - name: Testing disable icmp block inversion
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: 'some string'
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable icmp block inversion (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      icmp_block_inversion: 'some string'
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert icmp block inversion is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed

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

@@ -1,87 +0,0 @@
-# Test playbook for the firewalld module - interface operations
-# (c) 2022, Gregory Furlong <gnfzdz@fzdz.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-- name: Validate adding interface
-  block:
-  - name: Add lo interface to trusted zone
-    ansible.posix.firewalld:
-      interface: lo
-      zone: trusted
-      permanent: Yes
-      state: enabled
-    register: result
-
-  - name: assert lo was added to trusted zone
-    assert:
-      that:
-      - result is changed
-
-  - name: Add lo interface to trusted zone (verify not changed)
-    ansible.posix.firewalld:
-      interface: lo
-      zone: trusted
-      permanent: Yes
-      state: enabled
-    register: result
-
-  - name: assert lo was added to trusted zone (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Validate moving interfaces
-  block:
-  - name: Move lo interface from trusted zone to internal zone
-    ansible.posix.firewalld:
-      interface: lo
-      zone: internal
-      permanent: Yes
-      state: enabled
-    register: result
-
-  - name: Assert lo was moved from trusted zone to internal zone
-    assert:
-      that:
-      - result is changed
-
-  - name: Move lo interface from trusted zone to internal zone (verify not changed)
-    ansible.posix.firewalld:
-      interface: lo
-      zone: internal
-      permanent: Yes
-      state: enabled
-    register: result
-
-  - name: assert lo was moved from trusted zone to internal zone (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Validate removing interface
-  block:
-  - name: Remove lo interface from internal zone
-    ansible.posix.firewalld:
-      interface: lo
-      zone: internal
-      permanent: Yes
-      state: disabled
-    register: result
-
-  - name: Assert lo interface was removed from internal zone
-    assert:
-      that:
-      - result is changed
-
-  - name: Remove lo interface from internal zone (verify not changed)
-    ansible.posix.firewalld:
-      interface: lo
-      zone: internal
-      permanent: Yes
-      state: disabled
-    register: result
-
-  - name: Assert lo interface was removed from internal zone (verify not changed)
-    assert:
-      that:
-      - result is not changed

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

@@ -1,172 +0,0 @@
-# Test playbook for the firewalld module - masquerade operations
-# (c) 2022, Gregory Furlong <gnfzdz@fzdz.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-- name: Masquerade enabled when masquerade is truthy and state is enabled
-  block:
-  - name: Testing enable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: yes
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: yes
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Masquerade disabled when masquerade is falsy and state is enabled
-  block:
-  - name: Testing disable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: no
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: no
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Masquerade enabled when masquerade is falsy and state is disabled
-  block:
-  - name: Testing enable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: no
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: no
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Masquerade disabled when masquerade is truthy and state is disabled
-  block:
-  - name: Testing disable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: yes
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: yes
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-# Validate backwards compatible behavior until masquerade is switched from string to boolean type
-- name: Masquerade enabled when masquerade is non-boolean string and state is enabled
-  block:
-  - name: Testing enable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: 'some string'
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is enabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing enable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: 'some string'
-      permanent:  yes
-      state:      enabled
-    register: result
-
-  - name: assert masquerade is enabled (verify not changed)
-    assert:
-      that:
-      - result is not changed
-
-- name: Masquerade disabled when masquerade is non-boolean string and state is disabled
-  block:
-  - name: Testing disable masquerade
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: 'some string'
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is disabled
-    assert:
-      that:
-      - result is changed
-
-  - name: Testing disable masquerade (verify not changed)
-    ansible.posix.firewalld:
-      zone:       trusted
-      masquerade: 'some string'
-      permanent:  yes
-      state:      disabled
-    register: result
-
-  - name: assert masquerade is disabled (verify not changed)
-    assert:
-      that:
-      - result is not changed

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

@@ -4,7 +4,7 @@
 
 - name: firewalld port range test permanent enabled
   firewalld:
-    port: 5500-6850/tcp
+    port: 5500-6950/tcp
     permanent: true
     state: enabled
   register: result
@@ -16,7 +16,7 @@
 
 - name: firewalld port range test permanent enabled rerun (verify not changed)
   firewalld:
-    port: 5500-6850/tcp
+    port: 5500-6950/tcp
     permanent: true
     state: enabled
   register: result
@@ -57,7 +57,7 @@
     state: disabled
   loop:
     - 6900/tcp
-    - 5500-6850/tcp
+    - 5500-6950/tcp
 
 - name: firewalld port test permanent enabled
   firewalld:

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

@@ -1,65 +0,0 @@
-# Test playbook for the firewalld module - protocol operations
-# (c) 2022, Robért S. Guhr <rguhr@cronon.net>
-
-# 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 protocol test permanent enabled
-  firewalld:
-    protocol: ospf
-    permanent: true
-    state: enabled
-  register: result
-
-- name: assert firewalld protocol test permanent enabled worked
-  assert:
-    that:
-    - result is changed
-
-- name: firewalld protocol test permanent enabled rerun (verify not changed)
-  firewalld:
-    protocol: ospf
-    permanent: true
-    state: enabled
-  register: result
-
-- name: assert firewalld protocol test permanent enabled rerun worked (verify not changed)
-  assert:
-    that:
-    - result is not changed
-
-- name: firewalld protocol test permanent disabled
-  firewalld:
-    protocol: ospf
-    permanent: true
-    state: disabled
-  register: result
-
-- name: assert firewalld protocol test permanent disabled worked
-  assert:
-    that:
-    - result is changed
-
-- name: firewalld protocol test permanent disabled rerun (verify not changed)
-  firewalld:
-    protocol: ospf
-    permanent: true
-    state: disabled
-  register: result
-
-- name: assert firewalld protocol test permanent disabled rerun worked (verify not changed)
-  assert:
-    that:
-    - result is not changed

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

@@ -10,29 +10,14 @@
 # firewalld service operation test cases
 - include_tasks: service_test_cases.yml
 
-# firewalld protocol operation test cases
-- include_tasks: protocol_test_cases.yml
-
 # firewalld port operation test cases
 - include_tasks: port_test_cases.yml
 
 # firewalld source operation test cases
 - include_tasks: source_test_cases.yml
 
-# firewalld zone operation test cases
-- include_tasks: zone_test_cases.yml
-
 # firewalld zone target operation test cases
 - include_tasks: zone_target_test_cases.yml
 
 # firewalld port forwarding operation test cases
 - include_tasks: port_forward_test_cases.yml
-
-# firewalld masquerade operation test cases
-- include_tasks: masquerade_test_cases.yml
-
-# firewalld icmp block inversion operation test cases
-- include_tasks: icmp_block_inversion_test_cases.yml
-
-# firewalld interface operation test cases
-- include_tasks: interface_test_cases.yml

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

@@ -82,4 +82,4 @@
   assert:
     that:
     - result is not changed
-    - "result.msg == 'parameters are mutually exclusive: icmp_block|icmp_block_inversion|service|protocol|port|port_forward|rich_rule|interface|masquerade|source|target'"
+    - "result.msg == 'can only operate on port, service, rich_rule, masquerade, icmp_block, icmp_block_inversion, interface or source at once'"

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

@@ -1,47 +0,0 @@
-- name: firewalld create zone custom
-  firewalld:
-    zone: custom
-    permanent: True
-    state: present
-  register: result
-
-- name: assert firewalld custom zone created worked
-  assert:
-    that:
-    - result is changed
-
-- name: firewalld create zone custom rerun (verify not changed)
-  firewalld:
-    zone: custom
-    permanent: True
-    state: present
-  register: result
-
-- name: assert firewalld custom zone created worked (verify not changed)
-  assert:
-    that:
-    - result is not changed
-
-- name: firewalld remove zone custom
-  firewalld:
-    zone: custom
-    permanent: True
-    state: absent
-  register: result
-
-- name: assert firewalld custom zone removed worked
-  assert:
-    that:
-    - result is changed
-
-- name: firewalld remove custom zone rerun (verify not changed)
-  firewalld:
-    zone: custom
-    permanent: True
-    state: absent
-  register: result
-
-- name: assert firewalld custom zone removed worked (verify not changed)
-  assert:
-    that:
-    - result is not changed

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

@@ -1,9 +1,3 @@
-- name: Install dependencies
-  ansible.builtin.package:
-    name: e2fsprogs
-    state: present
-  when: ansible_system == 'Linux'
-
 - name: Create the mount point
   file:
     state: directory
@@ -412,270 +406,3 @@
     - /tmp/myfs1
     - /tmp/test_fstab
   when: ansible_system in ('Linux')
-
-- name: Block to test ephemeral option
-  environment:
-    PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-  block:
-  - name: Create empty file A
-    community.general.filesize:
-      path: /tmp/myfs_A.img
-      size: 20M
-
-  - name: Create empty file B
-    community.general.filesize:
-      path: /tmp/myfs_B.img
-      size: 20M
-
-  - name: Register facts on Linux
-    ansible.builtin.set_fact:
-      ephemeral_device_A: /tmp/myfs_A.img
-      ephemeral_device_B: /tmp/myfs_B.img
-      ephemeral_fstype: ext3
-      ephemeral_fstab: /etc/fstab
-    when: ansible_system == 'Linux'
-
-  - name: Register facts on Solaris/SunOS
-    ansible.builtin.set_fact:
-      ephemeral_device_A: /dev/lofi/1
-      ephemeral_device_B: /dev/lofi/2
-      ephemeral_create_loop_dev_cmd: >
-        lofiadm -a /tmp/myfs_A.img /dev/lofi/1 &&
-        lofiadm -a /tmp/myfs_B.img /dev/lofi/2
-      ephemeral_remove_loop_dev_cmd: >
-        lofiadm -d /dev/lofi/1 &&
-        lofiadm -d /dev/lofi/2 || true
-      ephemeral_fstype: ufs
-      ephemeral_fstab: /etc/vfstab
-    when: ansible_system == 'SunOS'
-
-  - name: Register facts on FreeBSD
-    ansible.builtin.set_fact:
-      ephemeral_device_A: /dev/md1
-      ephemeral_device_B: /dev/md2
-      ephemeral_create_loop_dev_cmd: >
-        mdconfig -a -t vnode -f /tmp/myfs_A.img -u /dev/md1 &&
-        mdconfig -a -t vnode -f /tmp/myfs_B.img -u /dev/md2
-      ephemeral_remove_loop_dev_cmd: >
-        mdconfig -d -u /dev/md1 &&
-        mdconfig -d -u /dev/md2
-      ephemeral_fstype: ufs
-      ephemeral_fstab: /etc/fstab
-    when: ansible_system == 'FreeBSD'
-
-  - name: Register facts on NetBSD
-    ansible.builtin.set_fact:
-      ephemeral_device_A: /dev/vnd1
-      ephemeral_device_B: /dev/vnd2
-      ephemeral_create_loop_dev_cmd: >
-        vnconfig /dev/vnd1 /tmp/myfs_A.img &&
-        vnconfig /dev/vnd2 /tmp/myfs_B.img
-      ephemeral_remove_loop_dev_cmd: >
-        vnconfig -u /dev/vnd1 &&
-        vnconfig -u /dev/vnd2
-      ephemeral_fstype: ufs
-      ephemeral_fstab: /etc/fstab
-    when: ansible_system == 'NetBSD'
-
-  - name: Register format fs command on Non-Linux and Non-OpenBSD
-    ansible.builtin.set_fact:
-      ephemeral_format_fs_cmd: >
-        yes | newfs {{ ephemeral_device_A }} &&
-        yes | newfs {{ ephemeral_device_B }}
-    when: ansible_system in ('SunOS', 'FreeBSD', 'NetBSD')
-
-  - name: Register facts on OpenBSD
-    ansible.builtin.set_fact:
-      ephemeral_device_A: /dev/vnd1c
-      ephemeral_device_B: /dev/vnd2c
-      ephemeral_create_loop_dev_cmd: >
-        vnconfig vnd1 /tmp/myfs_A.img &&
-        vnconfig vnd2 /tmp/myfs_B.img
-      ephemeral_remove_loop_dev_cmd: >
-        vnconfig -u vnd1 &&
-        vnconfig -u vnd2
-      ephemeral_format_fs_cmd: >
-        yes | newfs /dev/rvnd1c &&
-        yes | newfs /dev/rvnd2c
-      ephemeral_fstype: ffs
-      ephemeral_fstab: /etc/fstab
-    when: ansible_system == 'OpenBSD'
-
-##### FORMAT FS ON LINUX
-
-  - name: Block to format FS on Linux
-    block:
-    - name: Format FS A on Linux
-      community.general.filesystem:
-        fstype: ext3
-        dev: /tmp/myfs_A.img
-
-    - name: Format FS B on Linux
-      community.general.filesystem:
-        fstype: ext3
-        dev: /tmp/myfs_B.img
-    when: ansible_system == 'Linux'
-
-##### FORMAT FS ON SOLARIS AND BSD
-
-  - name: Create loop devices on Solaris and BSD
-    ansible.builtin.shell: "{{ ephemeral_create_loop_dev_cmd }}"
-    when: ephemeral_create_loop_dev_cmd is defined
-
-  - name: Format FS A and B on Solaris and BSD
-    ansible.builtin.shell: "{{ ephemeral_format_fs_cmd }}"
-    when: ephemeral_format_fs_cmd is defined
-
-##### TESTS
-
-  - name: Create fstab if it does not exist
-    ansible.builtin.file:
-      path: "{{ ephemeral_fstab }}"
-      state: touch
-
-  - name: Get checksum of /etc/fstab before mounting anything
-    stat:
-      path: '{{ ephemeral_fstab }}'
-    register: fstab_stat_before_mount
-
-  - name: Mount the FS A with ephemeral state
-    mount:
-      path: /tmp/myfs
-      src: '{{ ephemeral_device_A }}'
-      fstype: '{{ ephemeral_fstype }}'
-      opts: rw
-      state: ephemeral
-    register: ephemeral_mount_info
-
-  - name: Put something in the directory so we can do additional checks later on
-    copy:
-      content: 'Testing'
-      dest: /tmp/myfs/test_file
-
-  - name: Get checksum of /etc/fstab after an ephemeral mount
-    stat:
-      path: '{{ ephemeral_fstab }}'
-    register: fstab_stat_after_mount
-
-  - name: Get mountinfo
-    shell: mount -v | awk '{print $3}' | grep '^/tmp/myfs$' | wc -l
-    register: check_mountinfo
-    changed_when: no
-
-  - name: Assert the mount occured and the fstab is unchanged
-    assert:
-      that:
-      - check_mountinfo.stdout|int == 1
-      - ephemeral_mount_info['changed']
-      - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']
-
-  - name: Get first mount record
-    shell: mount -v | grep '/tmp/myfs'
-    register: ephemeral_mount_record_1
-    changed_when: no
-
-  - name: Try to mount FS A where FS A is already mounted (should trigger remount and changed)
-    mount:
-      path: /tmp/myfs
-      src: '{{ ephemeral_device_A }}'
-      fstype: '{{ ephemeral_fstype }}'
-      opts: ro
-      state: ephemeral
-    register: ephemeral_mount_info
-
-  - name: Get second mount record (should be different than the first)
-    shell: mount -v | grep '/tmp/myfs'
-    register: ephemeral_mount_record_2
-    changed_when: no
-
-  - name: Get mountinfo
-    shell: mount -v | awk '{print $3}' | grep '^/tmp/myfs$' | wc -l
-    register: check_mountinfo
-    changed_when: no
-
-  - name: Assert the FS A is still mounted, the options changed and the fstab unchanged
-    assert:
-      that:
-        - check_mountinfo.stdout|int == 1
-        - ephemeral_mount_record_1.stdout != ephemeral_mount_record_2.stdout
-        - ephemeral_mount_info['changed']
-        - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']
-
-  - name: Try to mount file B on file A mountpoint (should fail)
-    mount:
-      path: /tmp/myfs
-      src: '{{ ephemeral_device_B }}'
-      fstype: '{{ ephemeral_fstype }}'
-      state: ephemeral
-    register: ephemeral_mount_b_info
-    ignore_errors: true
-
-  - name: Get third mount record (should be the same than the second)
-    shell: mount -v | grep '/tmp/myfs'
-    register: ephemeral_mount_record_3
-    changed_when: no
-
-  - name: Get mountinfo
-    shell: mount -v | awk '{print $3}' | grep '^/tmp/myfs$' | wc -l
-    register: check_mountinfo
-    changed_when: no
-
-  - name: Try to stat our test file
-    stat:
-      path: /tmp/myfs/test_file
-    register: test_file_stat
-
-  - name: Assert that mounting FS B over FS A failed
-    assert:
-      that:
-        - check_mountinfo.stdout|int == 1
-        - ephemeral_mount_record_2.stdout == ephemeral_mount_record_3.stdout
-        - test_file_stat['stat']['exists']
-        - ephemeral_mount_b_info is failed
-
-  - name: Unmount FS with state = unmounted
-    mount:
-      path: /tmp/myfs
-      state: unmounted
-
-  - name: Get fstab checksum after unmounting an ephemeral mount with state = unmounted
-    stat:
-      path: '{{ ephemeral_fstab }}'
-    register: fstab_stat_after_unmount
-
-  - name: Get mountinfo
-    shell: mount -v | awk '{print $3}' | grep '^/tmp/myfs$' | wc -l
-    register: check_mountinfo
-    changed_when: no
-
-  - name: Try to stat our test file
-    stat:
-      path: /tmp/myfs/test_file
-    register: test_file_stat
-
-  - name: Assert that fstab is unchanged after unmounting an ephemeral mount with state = unmounted
-    assert:
-      that:
-      - check_mountinfo.stdout|int == 0
-      - not test_file_stat['stat']['exists']
-      - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_unmount['stat']['checksum']
-
-  always:
-    - name: Unmount potential failure relicas
-      mount:
-        path: /tmp/myfs
-        state: unmounted
-
-    - name: Remove loop devices on Solaris and BSD
-      ansible.builtin.shell: "{{ ephemeral_remove_loop_dev_cmd }}"
-      when: ephemeral_remove_loop_dev_cmd is defined
-
-    - name: Remove the test FS
-      file:
-        path: '{{ item }}'
-        state: absent
-      loop:
-        - /tmp/myfs_A.img
-        - /tmp/myfs_B.img
-        - /tmp/myfs
-  when: ansible_system in ('Linux', 'SunOS', 'FreeBSD', 'NetBSD', 'OpenBSD')

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

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-- include_tasks: seboolean.yml
+- include: seboolean.yml
   when:
     - ansible_selinux is defined
     - ansible_selinux != False

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

@@ -23,13 +23,13 @@
     msg: SELinux is {{ ansible_selinux.status }}
   when: ansible_selinux is defined and ansible_selinux != False
 
-- include_tasks: selinux.yml
+- include: selinux.yml
   when:
     - ansible_selinux is defined
     - ansible_selinux != False
     - ansible_selinux.status == 'enabled'
 
-- include_tasks: selogin.yml
+- include: selogin.yml
   when:
     - ansible_selinux is defined
     - ansible_selinux != False

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

@@ -170,7 +170,7 @@
 
     - name: Try sysctl with no name
       sysctl:
-        name: ""
+        name:
         value: 1
         sysctl_set: yes
       ignore_errors: True
@@ -180,7 +180,7 @@
       assert:
         that:
           - sysctl_no_name is failed
-          - "sysctl_no_name.msg == 'name cannot be blank'"
+          - "sysctl_no_name.msg == 'name cannot be None'"
 
     - name: Try sysctl with no value
       sysctl:

tests/requirements.yml

@@ -0,0 +1,4 @@
+integration_tests_dependencies:
+- community.general
+unit_tests_dependencies:
+- community.general

tests/sanity/ignore-2.14.txt

@@ -1,8 +0,0 @@
-plugins/modules/synchronize.py pylint:disallowed-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/sanity/ignore-2.15.txt

@@ -1,8 +0,0 @@
-plugins/modules/synchronize.py pylint:disallowed-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/sanity/ignore-2.16.txt

@@ -1,5 +0,0 @@
-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/unit/compat/builtins.py

@@ -31,4 +31,3 @@ except ImportError:
     BUILTINS = 'builtins'
 else:
     BUILTINS = '__builtin__'
-    __all__ = ['__builtin__']

tests/unit/plugins/action/test_synchronize.py

@@ -19,6 +19,7 @@ import os
 import unittest
 import yaml
 
+import ansible.plugins
 from ansible_collections.ansible.posix.tests.unit.compat.mock import patch, MagicMock
 from ansible_collections.ansible.posix.plugins.action.synchronize import ActionModule
 
@@ -54,7 +55,6 @@ class TaskMock(object):
     become = None
     become_user = None
     become_method = None
-    check_mode = False
 
 
 class StdinMock(object):

tests/unit/requirements.yml

@@ -1,3 +0,0 @@
----
-collections:
-- community.general

tests/utils/shippable/shippable.sh

@@ -50,7 +50,7 @@ function retry
         echo "@* -> ${result}"
     done
     echo "Command '@*' failed 3 times!"
-    exit 255
+    exit -1
 }
 
 command -v pip
@@ -74,14 +74,7 @@ else
 fi
 
 # START: HACK install dependencies
-if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then
-    # Note: Since community.general 5.x, Ansible Core versions prior to 2.11 are not supported.
-    # So we need to use 4.8.1 for Ansible 2.9 and Ansible Engine 2.10.
-    retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
-else
-    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
-fi
-# Note:  we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
+retry ansible-galaxy collection install community.general
 # END: HACK
 
 export PYTHONIOENCODING='utf-8'
@@ -145,7 +138,9 @@ function cleanup
         fi
 
         if [ "${process_coverage}" ]; then
-            python3 -m venv ~/ansible-venv
+            # use python 3.7 for coverage to avoid running out of memory during coverage xml processing
+            # only use it for coverage to avoid the additional overhead of setting up a virtual environment for a potential no-op job
+            virtualenv --python /usr/bin/python3.7 ~/ansible-venv
             set +ux
             . ~/ansible-venv/bin/activate
             set -ux