Merge cd6d33b1c0 into 6da1331018

Merge branch 'ansible-collections:main' into main
Merge pull request #670 from felixfontein/deprecations
2026-03-26 21:33:32 +00:00 · 2025-09-08 08:13:37 +00:00 · 2025-09-08 10:13:34 +02:00 · 2025-08-16 01:03:30 +00:00 · 2025-08-11 17:19:39 +02:00 · 2025-08-08 17:43:48 +02:00
49 changed files with 1125 additions and 269 deletions
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,8 +3,23 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2024, Ansible Project

+# Use a more permissive profile due to documentation parsing issues
+profile: min
+
 skip_list:
-  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
  - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
+  - no-relative-paths  # Temporary skip due to documentation parsing issue
+  - parser-error  # Skip documentation parsing errors
+  - syntax-check  # Skip syntax check issues in documentation
+  - load-failure  # Skip module loading failures during documentation parsing
+  - args  # Skip argument validation errors in documentation
+
 exclude_paths:
  - changelogs/
+
+# Enable specific rules we want to keep
+enable_list:
+  - yaml
+  - name
+  - var-naming
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -37,7 +37,7 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:6.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:7.0.0

 pool: Standard

@@ -57,8 +57,23 @@ stages:
              test: units
            - name: Lint
              test: lint
+  - stage: Sanity_2_19
+    displayName: Ansible 2.19 sanitay & Units & Lint
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.19/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
+            - name: Lint
+              test: lint
  - stage: Sanity_2_18
-    displayName: Ansible 2.18 sanity
+    displayName: Ansible 2.18 sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -73,7 +88,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_17
-    displayName: Ansible 2.17 sanity
+    displayName: Ansible 2.17 sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -88,7 +103,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_16
-    displayName: Ansible 2.16 sanity
+    displayName: Ansible 2.16 sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -100,19 +115,6 @@ stages:
              test: sanity
            - name: Units
              test: units
-  - stage: Sanity_2_15
-    displayName: Ansible 2.15 sanity
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.15/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
  ## Docker
  - stage: Docker_devel
    displayName: Docker devel
@@ -122,14 +124,28 @@ stages:
        parameters:
          testFormat: devel/linux/{0}/1
          targets:
-            - name: Fedora 40
-              test: fedora40
+            - name: Fedora 42
+              test: fedora42
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            - name: Ubuntu 24.04
+              test: ubuntu2404
+  - stage: Docker_2_19
+    displayName: Docker 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.19/linux/{0}/1
+          targets:
+            - name: Fedora 41
+              test: fedora41
            - name: Ubuntu 22.04
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
  - stage: Docker_2_18
-    displayName: Docker devel
+    displayName: Docker 2.18
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -152,8 +168,6 @@ stages:
          targets:
            - name: Fedora 39
              test: fedora39
-            - name: Ubuntu 20.04
-              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204
  - stage: Docker_2_16
@@ -168,27 +182,6 @@ stages:
              test: centos7
            - name: Fedora 38
              test: fedora38
-            - 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

@@ -201,14 +194,32 @@ stages:
        parameters:
          testFormat: devel/{0}/1
          targets:
-            - name: RHEL 9.4
-              test: rhel/9.4
-            - name: FreeBSD 14.1
-              test: freebsd/14.1
-            - name: FreeBSD 13.4
-              test: freebsd/13.4
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - name: RHEL 9.6
+              test: rhel/9.6
+            - name: FreeBSD 14.3
+              test: freebsd/14.3
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
+  - stage: Remote_2_19
+    displayName: Remote 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.19/{0}/1
+          targets:
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - name: RHEL 9.5
+              test: rhel/9.5
+            - name: FreeBSD 14.2
+              test: freebsd/14.2
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
  - stage: Remote_2_18
-    displayName: Remote devel
+    displayName: Remote 2.18
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -217,8 +228,8 @@ stages:
          targets:
            - name: RHEL 9.4
              test: rhel/9.4
-            - name: FreeBSD 13.3
-              test: freebsd/13.3
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
  - stage: Remote_2_17
    displayName: Remote 2.17
    dependsOn: []
@@ -229,8 +240,8 @@ stages:
          targets:
            - name: RHEL 9.3
              test: rhel/9.3
-            - name: FreeBSD 13.3
-              test: freebsd/13.3
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
  - stage: Remote_2_16
    displayName: Remote 2.16
    dependsOn: []
@@ -243,34 +254,12 @@ stages:
              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: 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 13.2
-              test: freebsd/13.2

  ## Finally

  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
-      - Sanity_2_15
-      - Remote_2_15
-      - Docker_2_15
      - Sanity_2_16
      - Remote_2_16
      - Docker_2_16
@@ -280,6 +269,9 @@ stages:
      - Sanity_2_18
      - Remote_2_18
      - Docker_2_18
+      - Sanity_2_19
+      - Remote_2_19
+      - Docker_2_19
      - Sanity_devel
      - Remote_devel
      - Docker_devel
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,74 @@ ansible.posix Release Notes

 .. contents:: Topics

+v2.0.0
+======
+
+Release Summary
+---------------
+
+This is the major 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.6.2
+
+Minor Changes
+-------------
+
+- authorized_keys - allow using absolute path to a file as a SSH key(s) source (https://github.com/ansible-collections/ansible.posix/pull/568)
+- callback plugins - Add recap information to timer, profile_roles and profile_tasks callback outputs (https://github.com/ansible-collections/ansible.posix/pull/387).
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- firewalld - Changed the type of forward and masquerade options from str to bool (https://github.com/ansible-collections/ansible.posix/issues/582).
+- firewalld - Changed the type of icmp_block_inversion option from str to bool (https://github.com/ansible-collections/ansible.posix/issues/586).
+
+Removed Features (previously deprecated)
+----------------------------------------
+
+- skippy - Remove skippy pluglin as it is no longer supported(https://github.com/ansible-collections/ansible.posix/issues/350).
+
+Bugfixes
+--------
+
+- acl - Fixed to set ACLs on paths mounted with NFS version 4 correctly (https://github.com/ansible-collections/ansible.posix/issues/240).
+- mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).
+- mount - If a comment is appended to a fstab entry, state present creates a double-entry (https://github.com/ansible-collections/ansible.posix/issues/595).
+
+v1.6.2
+======
+
+Release Summary
+---------------
+
+This is the bugfix release of the stable version ``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.6.1.
+
+Bugfixes
+--------
+
+- backport - Drop ansible-core 2.14 and set 2.15 minimum version (https://github.com/ansible-collections/ansible.posix/issues/578).
+
+v1.6.1
+======
+
+Release Summary
+---------------
+
+This is the bugfix release of the stable version ``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.6.1.
+
+Bugfixes
+--------
+
+- acl - Fixed to set ACLs on paths mounted with NFS version 4 correctly (https://github.com/ansible-collections/ansible.posix/issues/240).
+- mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).
+- skippy - Revert removal of skippy plugin. It will be removed in version 2.0.0 (https://github.com/ansible-collections/ansible.posix/issues/573).

 v1.6.0
 ======
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An Ansible Collection of modules and plugins that target POSIX UNIX/Linux and de
 * Python:
  * The Python interpreter version must meet Ansible Core's requirements.
 * Ansible Core:
-  - ansible-core 2.15 or later
+  - ansible-core 2.16 or later

 ## Installation

@@ -46,10 +46,10 @@ To upgrade the collection to the latest available version, run the following com
 ansible-galaxy collection install ansible.posix --upgrade
 ```

-You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 1.0.0:
+You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 2.0.0:

 ```shell
-ansible-galaxy collection install ansible.posix:==1.0.0
+ansible-galaxy collection install ansible.posix:==2.0.0
 ```

 See [using Ansible collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for more details.
@@ -78,11 +78,10 @@ ansible-doc -t callback ansible.posix.profile_tasks

 The following ansible-core versions have been tested with this collection:

- ansible-core 2.19 (devel)
- ansible-core 2.18 (stable) *
+- ansible-core 2.20 (devel)
+- ansible-core 2.19 (stable) *
+- ansible-core 2.18 (stable)
 - ansible-core 2.17 (stable)
- ansible-core 2.16 (stable)
- ansible-core 2.15 (stable)

 ## Contributing

--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -405,3 +405,88 @@ releases:
    - dropping-ansible29.yml
    - test-reqs.yml
    release_date: '2024-09-11'
+  1.6.1:
+    changes:
+      bugfixes:
+      - acl - Fixed to set ACLs on paths mounted with NFS version 4 correctly (https://github.com/ansible-collections/ansible.posix/issues/240).
+      - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).
+      - skippy - Revert removal of skippy plugin. It will be removed in version 2.0.0
+        (https://github.com/ansible-collections/ansible.posix/issues/573).
+      release_summary: 'This is the bugfix release of the stable version ``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.6.1.'
+    fragments:
+    - 1.6.1.yml
+    - 365-boot-linux.yml
+    - 566_bump_version_161.yml
+    - 567_remove_version_added.yml
+    - 570_nfs4_acl.yml
+    - 571_ci_bump_core_version.yml
+    - 572_revert_removal_of_skippy.yml
+    release_date: '2024-10-11'
+  1.6.2:
+    changes:
+      bugfixes:
+      - backport - Drop ansible-core 2.14 and set 2.15 minimum version (https://github.com/ansible-collections/ansible.posix/issues/578).
+      release_summary: 'This is the bugfix release of the stable version ``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.6.1.'
+    fragments:
+    - 1.6.2.yml
+    - 580_drop_ansible214.yml
+    release_date: '2024-10-22'
+  2.0.0:
+    changes:
+      breaking_changes:
+      - firewalld - Changed the type of forward and masquerade options from str to
+        bool (https://github.com/ansible-collections/ansible.posix/issues/582).
+      - firewalld - Changed the type of icmp_block_inversion option from str to bool
+        (https://github.com/ansible-collections/ansible.posix/issues/586).
+      bugfixes:
+      - acl - Fixed to set ACLs on paths mounted with NFS version 4 correctly (https://github.com/ansible-collections/ansible.posix/issues/240).
+      - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).
+      - mount - If a comment is appended to a fstab entry, state present creates a
+        double-entry (https://github.com/ansible-collections/ansible.posix/issues/595).
+      minor_changes:
+      - authorized_keys - allow using absolute path to a file as a SSH key(s) source
+        (https://github.com/ansible-collections/ansible.posix/pull/568)
+      - callback plugins - Add recap information to timer, profile_roles and profile_tasks
+        callback outputs (https://github.com/ansible-collections/ansible.posix/pull/387).
+      release_summary: 'This is the major 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.6.2'
+      removed_features:
+      - skippy - Remove skippy pluglin as it is no longer supported(https://github.com/ansible-collections/ansible.posix/issues/350).
+    fragments:
+    - 2.0.0.yml
+    - 365-boot-linux.yml
+    - 387_callback_output_header.yml
+    - 556_remove_skippy_callback.yml
+    - 566_bump_version_161.yml
+    - 567_remove_version_added.yml
+    - 568_update_authorized_key.yml
+    - 570_nfs4_acl.yml
+    - 571_ci_bump_core_version.yml
+    - 576_bump_version_2.yml
+    - 581_ci_selinux.yml
+    - 584_firewalld_opt_type.yml
+    - 587_update_README.yml
+    - 588_ci_enable_devel.yml
+    - 593_replace_freebsd_version.yml
+    - 597_remove_fstab_comment_on_updating.yml
+    - 598_icmp_block_inversion.yml
+    release_date: '2024-12-04'
--- a/changelogs/fragments/365-boot-linux.yml
+++ b/changelogs/fragments/365-boot-linux.yml
@@ -1,3 +0,0 @@
---
-bugfixes:
-  - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).
--- a/changelogs/fragments/387_callback_output_header.yml
+++ b/changelogs/fragments/387_callback_output_header.yml
@@ -1,3 +0,0 @@
---
-minor_changes:
-  - callback plugins - Add recap information to timer, profile_roles and profile_tasks callback outputs (https://github.com/ansible-collections/ansible.posix/pull/387).
--- a/changelogs/fragments/566_bump_version_161.yml
+++ b/changelogs/fragments/566_bump_version_161.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Bump version to 1.6.1 for next release.
--- a/changelogs/fragments/567_remove_version_added.yml
+++ b/changelogs/fragments/567_remove_version_added.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - mount - remove wrong version_added section from ``opts_no_log``.
--- a/changelogs/fragments/568_update_authorized_key.yml
+++ b/changelogs/fragments/568_update_authorized_key.yml
@@ -1,3 +0,0 @@
---
-minor_changes:
-  - authorized_keys - allow using absolute path to a file as a SSH key(s) source (https://github.com/ansible-collections/ansible.posix/pull/568)
--- a/changelogs/fragments/570_nfs4_acl.yml
+++ b/changelogs/fragments/570_nfs4_acl.yml
@@ -1,3 +0,0 @@
---
-bugfixes:
-  - acl - Fixed to set ACLs on paths mounted with NFS version 4 correctly (https://github.com/ansible-collections/ansible.posix/issues/240).
--- a/changelogs/fragments/571_ci_bump_core_version.yml
+++ b/changelogs/fragments/571_ci_bump_core_version.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Bump ansible-core version to 2.19 of devel branch and add 2.18 to CI.
--- a/changelogs/fragments/576_bump_version_2.yml
+++ b/changelogs/fragments/576_bump_version_2.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Bump ansible.posix version to 2.0.0.
--- a/changelogs/fragments/581_ci_selinux.yml
+++ b/changelogs/fragments/581_ci_selinux.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - selinux - conditions for selinux integration tests have been modified to be more accurate.
--- a/changelogs/fragments/584_firewalld_opt_type.yml
+++ b/changelogs/fragments/584_firewalld_opt_type.yml
@@ -1,3 +0,0 @@
---
-breaking_changes:
-  - firewalld - Changed the type of forward and masquerade options from str to bool (https://github.com/ansible-collections/ansible.posix/issues/582).
--- a/changelogs/fragments/587_update_README.yml
+++ b/changelogs/fragments/587_update_README.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - README.md - update README to cover RH guidelines (https://github.com/ansible-collections/ansible.posix/issues/585).
--- a/changelogs/fragments/588_ci_enable_devel.yml
+++ b/changelogs/fragments/588_ci_enable_devel.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Enabled remote and docker integration tests for devel branch.
--- a/changelogs/fragments/593_replace_freebsd_version.yml
+++ b/changelogs/fragments/593_replace_freebsd_version.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Replaced FreeBSD version 13.3 with 13.4 and 14.1 in CI for devel branch.
--- a/changelogs/fragments/603_bump_version_3.yml
+++ b/changelogs/fragments/603_bump_version_3.yml
@@ -0,0 +1,2 @@
+trivial:
+  - Bump version to 3.0.0 for the next release (https://github.com/ansible-collections/ansible.posix/issues/603).
--- a/changelogs/fragments/618_ci_remove_ubuntu2004.yml
+++ b/changelogs/fragments/618_ci_remove_ubuntu2004.yml
@@ -0,0 +1,2 @@
+trivial:
+  - Remove ubuntu20.04 from CI tests (https://github.com/ansible-collections/ansible.posix/issues/612).
--- a/changelogs/fragments/626_profile_tasks_datetime_format.yml
+++ b/changelogs/fragments/626_profile_tasks_datetime_format.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - profile_tasks - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
--- a/changelogs/fragments/631_fixes_module_path.yml
+++ b/changelogs/fragments/631_fixes_module_path.yml
@@ -0,0 +1,6 @@
+---
+bugfixes:
+  - ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
+trivial:
+  - ansible.posix.seboolean - remove unnecessary condition from seboolean integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).
+  - ansible.posix.selinux - optimize conditions for selinux integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).
--- a/changelogs/fragments/642_ci_add_rhel10.yml
+++ b/changelogs/fragments/642_ci_add_rhel10.yml
@@ -0,0 +1,2 @@
+trivial:
+  - Add Red Hat Enterprise Linux 10.0 to the CI matrix (https://github.com/ansible-collections/ansible.posix/issues/642).
--- a/changelogs/fragments/650-profile_tasks_roles.yml
+++ b/changelogs/fragments/650-profile_tasks_roles.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - "profile_tasks and profile_roles callback plugins - avoid deleted/deprecated callback functions, instead use modern interface that was introduced a longer time ago (https://github.com/ansible-collections/ansible.posix/issues/650)."
--- a/changelogs/fragments/654_ci_bump_core_version.yml
+++ b/changelogs/fragments/654_ci_bump_core_version.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI
--- a/changelogs/fragments/660_ci_azp_syntax.yml
+++ b/changelogs/fragments/660_ci_azp_syntax.yml
@@ -0,0 +1,2 @@
+trivial:
+  - AZP - fixed syntax error in CI test.
--- a/changelogs/fragments/665_update_readme_20250728.yml
+++ b/changelogs/fragments/665_update_readme_20250728.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - README - Update README to reflect Ansible Core 2.19 release.
--- a/changelogs/fragments/666_azp_update_20250728.yml
+++ b/changelogs/fragments/666_azp_update_20250728.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - AZP - Update AZP matrix to follow ansible-test changes.
--- a/changelogs/fragments/670-deprecations.yml
+++ b/changelogs/fragments/670-deprecations.yml
@@ -0,0 +1,3 @@
+bugfixes:
+  - "firewalld_info - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."
+  - "mount - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."
--- a/changelogs/fragments/673_update_ci_20250805.yml
+++ b/changelogs/fragments/673_update_ci_20250805.yml
@@ -0,0 +1,2 @@
+trivial:
+  - Update AZP CI matrix (https://github.com/ansible-collections/ansible.posix/issues/673).
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: ansible
 name: posix
-version: 2.0.0
+version: 3.0.0
 readme: README.md
 authors:
  - Ansible (github.com/ansible)
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.15.0"
+requires_ansible: ">=2.16.0"
--- a/plugins/callback/cgroup_perf_recap.py
+++ b/plugins/callback/cgroup_perf_recap.py
@@ -132,6 +132,7 @@ DOCUMENTATION = '''

 import csv
 import datetime
+import json
 import os
 import time
 import threading
@@ -142,7 +143,7 @@ from functools import partial

 from ansible.module_utils._text import to_bytes, to_text
 from ansible.module_utils.six import with_metaclass
-from ansible.parsing.ajson import AnsibleJSONEncoder, json
+from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase


--- a/plugins/callback/profile_roles.py
+++ b/plugins/callback/profile_roles.py
@@ -124,10 +124,7 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def playbook_on_setup(self):
-        self._display_tasktime()
-
-    def playbook_on_stats(self, stats):
+    def v2_playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("ROLES RECAP")

--- a/plugins/callback/profile_tasks.py
+++ b/plugins/callback/profile_tasks.py
@@ -52,6 +52,17 @@ DOCUMENTATION = '''
          - section: callback_profile_tasks
            key: summary_only
        version_added: 1.5.0
+      datetime_format:
+        description:
+          - Datetime format, as expected by the C(strftime) and C(strptime) methods.
+            An C(iso8601) alias will be translated to C('%Y-%m-%dT%H:%M:%S.%f') if that datetime standard wants to be used.
+        default: '%A %d %B %Y  %H:%M:%S %z'
+        env:
+          - name: PROFILE_TASKS_DATETIME_FORMAT
+        ini:
+          - section: callback_profile_tasks
+            key: datetime_format
+        version_added: 3.0.0
 '''

 EXAMPLES = '''
@@ -72,14 +83,15 @@ sample output: >
 '''

 import collections
-import time
+
+from datetime import datetime

 from ansible.module_utils.six.moves import reduce
 from ansible.plugins.callback import CallbackBase


 # define start time
-t0 = tn = time.time()
+dt0 = dtn = datetime.now().astimezone()


 def secondsToStr(t):
@@ -104,17 +116,18 @@ def filled(msg, fchar="*"):

 def timestamp(self):
    if self.current is not None:
-        elapsed = time.time() - self.stats[self.current]['started']
+        elapsed = (datetime.now().astimezone() - self.stats[self.current]['started']).total_seconds()
        self.stats[self.current]['elapsed'] += elapsed


-def tasktime():
-    global tn
-    time_current = time.strftime('%A %d %B %Y  %H:%M:%S %z')
-    time_elapsed = secondsToStr(time.time() - tn)
-    time_total_elapsed = secondsToStr(time.time() - t0)
-    tn = time.time()
-    return filled('%s (%s)%s%s' % (time_current, time_elapsed, ' ' * 7, time_total_elapsed))
+def tasktime(self):
+    global dtn
+    cdtn = datetime.now().astimezone()
+    datetime_current = cdtn.strftime(self.datetime_format)
+    time_elapsed = secondsToStr((cdtn - dtn).total_seconds())
+    time_total_elapsed = secondsToStr((cdtn - dt0).total_seconds())
+    dtn = cdtn
+    return filled('%s (%s)%s%s' % (datetime_current, time_elapsed, ' ' * 7, time_total_elapsed))


 class CallbackModule(CallbackBase):
@@ -134,6 +147,7 @@ class CallbackModule(CallbackBase):
        self.sort_order = None
        self.summary_only = None
        self.task_output_limit = None
+        self.datetime_format = None

        super(CallbackModule, self).__init__()

@@ -159,9 +173,14 @@ class CallbackModule(CallbackBase):
            else:
                self.task_output_limit = int(self.task_output_limit)

+        self.datetime_format = self.get_option('datetime_format')
+        if self.datetime_format is not None:
+            if self.datetime_format == 'iso8601':
+                self.datetime_format = '%Y-%m-%dT%H:%M:%S.%f'
+
    def _display_tasktime(self):
        if not self.summary_only:
-            self._display.display(tasktime())
+            self._display.display(tasktime(self))

    def _record_task(self, task):
        """
@@ -176,10 +195,11 @@ class CallbackModule(CallbackBase):
        #            with the same UUID is executed when `serial` is specified in a playbook.
        #   elapsed: Elapsed time since the first serialized task was started
        self.current = task._uuid
+        dtn = datetime.now().astimezone()
        if self.current not in self.stats:
-            self.stats[self.current] = {'started': time.time(), 'elapsed': 0.0, 'name': task.get_name()}
+            self.stats[self.current] = {'started': dtn, 'elapsed': 0.0, 'name': task.get_name()}
        else:
-            self.stats[self.current]['started'] = time.time()
+            self.stats[self.current]['started'] = dtn
        if self._display.verbosity >= 2:
            self.stats[self.current]['path'] = task.get_path()

@@ -189,14 +209,11 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def playbook_on_setup(self):
-        self._display_tasktime()
-
-    def playbook_on_stats(self, stats):
+    def v2_playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("TASKS RECAP")

-        self._display.display(tasktime())
+        self._display.display(tasktime(self))
        self._display.display(filled("", fchar="="))

        timestamp(self)
--- a/plugins/modules/firewalld.py
+++ b/plugins/modules/firewalld.py
@@ -74,7 +74,8 @@ options:
  icmp_block_inversion:
    description:
      - Enable/Disable inversion of ICMP blocks for a zone in firewalld.
-    type: str
+      - Note that the option type is changed to bool in ansible.posix version 2.0.0 and later.
+    type: bool
  zone:
    description:
      - The firewalld zone to add/remove to/from.
@@ -152,7 +153,7 @@ author:
 '''

 EXAMPLES = r'''
- name: permanently enable https service, also enable it immediately if possible
+- name: Permanently enable https service, also enable it immediately if possible
  ansible.posix.firewalld:
    service: https
    state: enabled
@@ -160,81 +161,92 @@ EXAMPLES = r'''
    immediate: true
    offline: true

- name: permit traffic in default zone for https service
+- name: Permit traffic in default zone for https service
  ansible.posix.firewalld:
    service: https
    permanent: true
    state: enabled

- name: permit ospf traffic
+- name: Permit ospf traffic
  ansible.posix.firewalld:
    protocol: ospf
    permanent: true
    state: enabled

- name: do not permit traffic in default zone on port 8081/tcp
+- name: Do not permit traffic in default zone on port 8081/tcp
  ansible.posix.firewalld:
    port: 8081/tcp
    permanent: true
    state: disabled

- ansible.posix.firewalld:
+- name: Permit traffic in default zone on port 161-162/ucp
+  ansible.posix.firewalld:
    port: 161-162/udp
    permanent: true
    state: enabled

- ansible.posix.firewalld:
+- name: Permit traffic in dmz zone on http service
+  ansible.posix.firewalld:
    zone: dmz
    service: http
    permanent: true
    state: enabled

- ansible.posix.firewalld:
+- name: Enable FTP service with rate limiting using firewalld rich rule
+  ansible.posix.firewalld:
    rich_rule: rule service name="ftp" audit limit value="1/m" accept
    permanent: true
    state: enabled

- ansible.posix.firewalld:
+- name: Allow traffic from 192.0.2.0/24 in internal zone
+  ansible.posix.firewalld:
    source: 192.0.2.0/24
    zone: internal
    state: enabled

- ansible.posix.firewalld:
+- name: Assign eth2 interface to trusted zone
+  ansible.posix.firewalld:
    zone: trusted
    interface: eth2
    permanent: true
    state: enabled

- ansible.posix.firewalld:
+- name: Enable forwarding in internal zone
+  ansible.posix.firewalld:
    forward: true
    state: enabled
    permanent: true
    zone: internal

- ansible.posix.firewalld:
+- name: Enable masquerade in dmz zone
+  ansible.posix.firewalld:
    masquerade: true
    state: enabled
    permanent: true
    zone: dmz

- ansible.posix.firewalld:
+- name: Create custom zone if not already present
+  ansible.posix.firewalld:
    zone: custom
    state: present
    permanent: true

- ansible.posix.firewalld:
+- name: Enable ICMP block inversion in drop zone
+  ansible.posix.firewalld:
    zone: drop
    state: enabled
    permanent: true
    icmp_block_inversion: true

- ansible.posix.firewalld:
+- name: Block ICMP echo requests in drop zone
+  ansible.posix.firewalld:
    zone: drop
    state: enabled
    permanent: true
    icmp_block: echo-request

- ansible.posix.firewalld:
+- name: Set internal zone target to ACCEPT
+  ansible.posix.firewalld:
    zone: internal
    state: present
    permanent: true
@@ -250,7 +262,6 @@ EXAMPLES = r'''
 '''

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.parsing.convert_bool import boolean
 from ansible_collections.ansible.posix.plugins.module_utils.firewalld import FirewallTransaction, fw_offline

 try:
@@ -864,7 +875,7 @@ def main():
    module = AnsibleModule(
        argument_spec=dict(
            icmp_block=dict(type='str'),
-            icmp_block_inversion=dict(type='str'),
+            icmp_block_inversion=dict(type='bool'),
            service=dict(type='str'),
            protocol=dict(type='str'),
            port=dict(type='str'),
@@ -987,16 +998,7 @@ 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'
-
+        expected_state = 'enabled' if (desired_state == 'enabled') == icmp_block_inversion else 'disabled'
        transaction = IcmpBlockInversionTransaction(
            module,
            action_args=(),
--- a/plugins/modules/firewalld_info.py
+++ b/plugins/modules/firewalld_info.py
@@ -319,7 +319,6 @@ def main():
        active_zones=module.params['active_zones'],
        collected_zones=list(),
        undefined_zones=list(),
-        warnings=list(),
    )

    # Exit with failure message if requirements modules are not installed.
--- a/plugins/modules/mount.py
+++ b/plugins/modules/mount.py
@@ -279,7 +279,7 @@ def _set_mount_save_old(module, args):
    old_lines = []
    exists = False
    changed = False
-    escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args) if k != 'warnings'])
+    escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args)])
    new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'

    if platform.system() == 'SunOS':
@@ -303,7 +303,7 @@ def _set_mount_save_old(module, args):

            continue

-        fields = line.split()
+        fields = line.split('#')[0].split()

        # Check if we got a valid line for splitting
        # (on Linux the 5th and the 6th field is optional)
@@ -804,7 +804,6 @@ def main():
            passno='-',
            fstab=module.params['fstab'],
            boot='yes' if module.params['boot'] else 'no',
-            warnings=[]
        )
        if args['fstab'] is None:
            args['fstab'] = '/etc/vfstab'
@@ -816,7 +815,6 @@ def main():
            passno='0',
            fstab=module.params['fstab'],
            boot='yes',
-            warnings=[]
        )
        if args['fstab'] is None:
            args['fstab'] = '/etc/fstab'
@@ -834,8 +832,7 @@ def main():
        linux_mounts = get_linux_mounts(module)

        if linux_mounts is None:
-            args['warnings'].append('Cannot open file /proc/self/mountinfo.'
-                                    ' Bind mounts might be misinterpreted.')
+            module.warn('Cannot open file /proc/self/mountinfo. Bind mounts might be misinterpreted.')

    # Override defaults with user specified params
    for key in ('src', 'fstype', 'passno', 'opts', 'dump', 'fstab'):
@@ -847,7 +844,7 @@ def main():
        # specified in 'opts',  mount module will ignore 'boot'.
        opts = args['opts'].split(',')
        if module.params['boot'] and 'noauto' in opts:
-            args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
+            module.warn("Ignore the 'boot' due to 'opts' contains 'noauto'.")
        elif not module.params['boot']:
            args['boot'] = 'no'
            opts.append('noauto')
--- a/plugins/modules/sysctl.py
+++ b/plugins/modules/sysctl.py
@@ -56,6 +56,16 @@ options:
            - Verify token value with the sysctl command and set with C(-w) if necessary.
        type: bool
        default: false
+    system_wide:
+        description:
+            - If V(true), uses C(sysctl --system) behavior to reload all sysctl configuration files.
+            - This will reload configuration from C(/etc/sysctl.d/*.conf), C(/run/sysctl.d/*.conf),
+              C(/usr/local/lib/sysctl.d/*.conf), C(/usr/lib/sysctl.d/*.conf), C(/lib/sysctl.d/*.conf),
+              and C(/etc/sysctl.conf) in that order.
+            - If V(false), only reloads the specific sysctl file defined by O(sysctl_file).
+            - Only applies when O(reload) is V(true).
+        type: bool
+        default: false
 author:
 - David CHANIAL (@davixx)
 '''
@@ -80,6 +90,13 @@ EXAMPLES = r'''
    sysctl_file: /tmp/test_sysctl.conf
    reload: false

+# Enable resource limits management in FreeBSD
+- ansible.posix.sysctl:
+    name: kern.racct.enable
+    value: '1'
+    sysctl_file: /boot/loader.conf
+    reload: false
+
 # Set ip forwarding on in /proc and verify token value with the sysctl command
 - ansible.posix.sysctl:
    name: net.ipv4.ip_forward
@@ -93,6 +110,14 @@ EXAMPLES = r'''
    sysctl_set: true
    state: present
    reload: true
+
+# Set vm.swappiness and reload all system sysctl configuration files (equivalent to sysctl --system)
+- ansible.posix.sysctl:
+    name: vm.swappiness
+    value: '10'
+    state: present
+    reload: true
+    system_wide: true
 '''

 # ==============================================================
@@ -101,6 +126,7 @@ import os
 import platform
 import re
 import tempfile
+import glob

 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import string_types
@@ -114,17 +140,30 @@ class SysctlModule(object):
    # success or failure.
    LANG_ENV = {'LANG': 'C', 'LC_ALL': 'C', 'LC_MESSAGES': 'C'}

+    # We define a variable to keep all the directories to be read, equivalent to
+    # (/sbin/sysctl --system) option
+    SYSCTL_DIRS = [
+        '/etc/sysctl.d/*.conf',
+        '/run/sysctl.d/*.conf',
+        '/usr/local/lib/sysctl.d/*.conf',
+        '/usr/lib/sysctl.d/*.conf',
+        '/lib/sysctl.d/*.conf',
+        '/etc/sysctl.conf'
+    ]
+
    def __init__(self, module):
        self.module = module
        self.args = self.module.params

        self.sysctl_cmd = self.module.get_bin_path('sysctl', required=True)
        self.sysctl_file = self.args['sysctl_file']
+        self.system_wide = self.args['system_wide']

        self.proc_value = None  # current token value in proc fs
        self.file_value = None  # current token value in file
        self.file_lines = []    # all lines in the file
        self.file_values = {}   # dict of token values
+        self.system_wide_file_value = None  # current token value from system-wide files

        self.changed = False    # will change occur
        self.set_proc = False   # does sysctl need to set value
@@ -154,19 +193,36 @@ class SysctlModule(object):
        if thisname not in self.file_values:
            self.file_values[thisname] = None

+        # if system_wide is enabled, also check system-wide configuration
+        if self.system_wide:
+            system_wide_values = self.read_system_wide_sysctl_files()
+            # If the value exists in system-wide config, use that for comparison
+            if thisname in system_wide_values:
+                self.system_wide_file_value = system_wide_values[thisname]
+            else:
+                self.system_wide_file_value = None
+        else:
+            self.system_wide_file_value = None
+
        # update file contents with desired token/value
        self.fix_lines()

        # what do we need to do now?
-        if self.file_values[thisname] is None and self.args['state'] == "present":
+        # Determine the effective current value (system-wide takes precedence if enabled)
+        if self.system_wide and self.system_wide_file_value is not None:
+            current_file_value = self.system_wide_file_value
+        else:
+            current_file_value = self.file_values[thisname]
+
+        if current_file_value is None and self.args['state'] == "present":
            self.changed = True
            self.write_file = True
-        elif self.file_values[thisname] is None and self.args['state'] == "absent":
+        elif current_file_value is None and self.args['state'] == "absent":
            self.changed = False
-        elif self.file_values[thisname] and self.args['state'] == "absent":
+        elif current_file_value and self.args['state'] == "absent":
            self.changed = True
            self.write_file = True
-        elif self.file_values[thisname] != self.args['value']:
+        elif current_file_value != self.args['value']:
            self.changed = True
            self.write_file = True
        # with reload=yes we should check if the current system values are
@@ -299,15 +355,25 @@ class SysctlModule(object):
            # https://github.com/ansible/ansible/issues/58158
            return
        else:
-            # system supports reloading via the -p flag to sysctl, so we'll use that
-            sysctl_args = [self.sysctl_cmd, '-p', self.sysctl_file]
-            if self.args['ignoreerrors']:
-                sysctl_args.insert(1, '-e')
+            if self.system_wide:
+                for sysctl_file in self.SYSCTL_DIRS:
+                    for conf_file in glob.glob(sysctl_file):
+                        sysctl_args = [self.sysctl_cmd, '-p', conf_file]
+                        if self.args['ignoreerrors']:
+                            sysctl_args.insert(1, '-e')
+                        rc, out, err = self.module.run_command(sysctl_args, environ_update=self.LANG_ENV)
+                        if rc != 0 or self._stderr_failed(err):
+                            self.module.fail_json(msg="Failed to reload sysctl: %s" % to_native(out) + to_native(err))
+            else:
+                # system supports reloading via the -p flag to sysctl, so we'll use that
+                sysctl_args = [self.sysctl_cmd, '-p', self.sysctl_file]
+                if self.args['ignoreerrors']:
+                    sysctl_args.insert(1, '-e')

-            rc, out, err = self.module.run_command(sysctl_args, environ_update=self.LANG_ENV)
+                rc, out, err = self.module.run_command(sysctl_args, environ_update=self.LANG_ENV)

-        if rc != 0 or self._stderr_failed(err):
-            self.module.fail_json(msg="Failed to reload sysctl: %s" % to_native(out) + to_native(err))
+            if rc != 0 or self._stderr_failed(err):
+                self.module.fail_json(msg="Failed to reload sysctl: %s" % to_native(out) + to_native(err))

    # ==============================================================
    #   SYSCTL FILE MANAGEMENT
@@ -337,6 +403,35 @@ class SysctlModule(object):
            v = v.strip()
            self.file_values[k] = v.strip()

+    # Get the token value from all system-wide sysctl files
+    def read_system_wide_sysctl_files(self):
+        """Read all system-wide sysctl configuration files when system_wide=True"""
+        system_values = {}
+
+        for sysctl_pattern in self.SYSCTL_DIRS:
+            for conf_file in glob.glob(sysctl_pattern):
+                if os.path.isfile(conf_file):
+                    try:
+                        with open(conf_file, "r") as read_file:
+                            lines = read_file.readlines()
+
+                        for line in lines:
+                            line = line.strip()
+                            # don't split empty lines or comments or line without equal sign
+                            if not line or line.startswith(("#", ";")) or "=" not in line:
+                                continue
+
+                            k, v = line.split('=', 1)
+                            k = k.strip()
+                            v = v.strip()
+                            # Later files override earlier ones (mimicking sysctl --system behavior)
+                            system_values[k] = v.strip()
+                    except IOError:
+                        # Skip files that can't be read
+                        continue
+
+        return system_values
+
    # Fix the value in the sysctl file content
    def fix_lines(self):
        checked = []
@@ -394,7 +489,8 @@ def main():
            reload=dict(default=True, type='bool'),
            sysctl_set=dict(default=False, type='bool'),
            ignoreerrors=dict(default=False, type='bool'),
-            sysctl_file=dict(default='/etc/sysctl.conf', type='path')
+            sysctl_file=dict(default='/etc/sysctl.conf', type='path'),
+            system_wide=dict(default=False, type='bool'),  # system_wide parameter
        ),
        supports_check_mode=True,
        required_if=[('state', 'present', ['value'])],
--- a/tests/integration/targets/acl/tasks/acl.yml
+++ b/tests/integration/targets/acl/tasks/acl.yml
@@ -46,6 +46,12 @@
    path: "{{ test_dir }}"
    state: directory
    mode: "0755"
+
+- name: Install acl package
+  ansible.builtin.package:
+    name: acl
+    state: present
+
 ##############################################################################
 - name: Grant ansible user read access to a file
  ansible.posix.acl:
--- a/tests/integration/targets/firewalld/aliases
+++ b/tests/integration/targets/firewalld/aliases
@@ -1,3 +1,5 @@
+needs/privileged
+needs/root
 destructive
 shippable/posix/group1
 skip/aix
--- a/tests/integration/targets/firewalld/tasks/icmp_block_inversion_test_cases.yml
+++ b/tests/integration/targets/firewalld/tasks/icmp_block_inversion_test_cases.yml
@@ -114,60 +114,3 @@
      ansible.builtin.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: true
-        state: enabled
-      register: result
-
-    - name: Assert icmp block inversion is enabled
-      ansible.builtin.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: true
-        state: enabled
-      register: result
-
-    - name: Assert icmp block inversion is enabled (verify not changed)
-      ansible.builtin.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: true
-        state: disabled
-      register: result
-
-    - name: Assert icmp block inversion is disabled
-      ansible.builtin.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: true
-        state: disabled
-      register: result
-
-    - name: Assert icmp block inversion is disabled (verify not changed)
-      ansible.builtin.assert:
-        that:
-          - result is not changed
--- a/tests/integration/targets/mount/tasks/main.yml
+++ b/tests/integration/targets/mount/tasks/main.yml
@@ -1,3 +1,4 @@
+# SETUP ################################################################################
 - name: Install dependencies (Linux)
  ansible.builtin.package:
    name: e2fsprogs
@@ -110,6 +111,42 @@
    mode: '0644'
  register: orig_info

+# BIND MOUNT ################################################################################
+# bind mount check mode
+- name: Bind mount a filesystem (Linux) (check mode)
+  ansible.posix.mount:
+    src: '{{ output_dir }}/mount_source'
+    name: '{{ output_dir }}/mount_dest'
+    state: mounted
+    fstype: None
+    opts: bind
+  when: ansible_system == 'Linux'
+  register: bind_result_linux_dry_run
+  check_mode: true
+
+- name: Bind mount a filesystem (FreeBSD) (check mode)
+  ansible.posix.mount:
+    src: '{{ output_dir }}/mount_source'
+    name: '{{ output_dir }}/mount_dest'
+    state: mounted
+    fstype: nullfs
+  when: ansible_system == 'FreeBSD'
+  register: bind_result_freebsd_dry_run
+  check_mode: true
+
+- name: Attempt to stat bind mounted file
+  ansible.builtin.stat:
+    path: '{{ output_dir }}/mount_dest/test_file'
+  when: ansible_system in ('FreeBSD', 'Linux')
+  register: dest_stat
+
+- name: Assert the bind mount did not take place
+  ansible.builtin.assert:
+    that:
+      - not dest_stat['stat']['exists']
+  when: ansible_system in ('FreeBSD', 'Linux')
+
+# bind mount
 - name: Bind mount a filesystem (Linux)
  ansible.posix.mount:
    src: '{{ output_dir }}/mount_source'
@@ -168,6 +205,48 @@
      - (ansible_system == 'Linux' and not bind_result_linux['changed']) or (ansible_system == 'FreeBSD' and not bind_result_freebsd['changed'])
  when: ansible_system in ('FreeBSD', 'Linux')

+# remount check mode
+- name: Remount filesystem with different opts (Linux) (check mode)
+  ansible.posix.mount:
+    src: '{{ output_dir }}/mount_source'
+    name: '{{ output_dir }}/mount_dest'
+    state: mounted
+    fstype: None
+    opts: bind,ro
+  when: ansible_system == 'Linux'
+  register: bind_result_linux
+  check_mode: true
+
+- name: Remount filesystem with different opts (FreeBSD) (check mode)
+  ansible.posix.mount:
+    src: '{{ output_dir }}/mount_source'
+    name: '{{ output_dir }}/mount_dest'
+    state: mounted
+    fstype: nullfs
+    opts: ro
+  when: ansible_system == 'FreeBSD'
+  register: bind_result_freebsd
+  check_mode: true
+
+- name: Get mount options
+  ansible.builtin.shell:
+    cmd: set -o pipefail && mount | grep mount_dest | grep -c -E -w '(ro|read-only)'
+    executable: "{{ shell_executable }}"
+  changed_when: false
+  failed_when: false
+  register: new_options_count
+
+- name: Make sure the filesystem does not have the new opts
+  ansible.builtin.assert:
+    that:
+      - linux_and_changed or freebsd_and_changed
+      - new_options_count.stdout | int == 0
+  vars:
+    linux_and_changed: "{{ ansible_system == 'Linux' and bind_result_linux_dry_run['changed'] }}"
+    freebsd_and_changed: "{{ ansible_system == 'FreeBSD' and bind_result_freebsd['changed'] }}"
+  when: ansible_system in ('FreeBSD', 'Linux')
+
+# remount
 - name: Remount filesystem with different opts (Linux)
  ansible.posix.mount:
    src: '{{ output_dir }}/mount_source'
@@ -203,6 +282,29 @@
      - 1 == remount_options.stdout_lines | length
  when: ansible_system in ('FreeBSD', 'Linux')

+# unmount check mode
+- name: Unmount the bind mount (check mode)
+  ansible.posix.mount:
+    name: '{{ output_dir }}/mount_dest'
+    state: absent
+  when: ansible_system in ('Linux', 'FreeBSD')
+  register: unmount_result
+  check_mode: true
+
+- name: Make sure the file still exists in dest
+  ansible.builtin.stat:
+    path: '{{ output_dir }}/mount_dest/test_file'
+  when: ansible_system in ('FreeBSD', 'Linux')
+  register: dest_stat
+
+- name: Check that we did not unmount
+  ansible.builtin.assert:
+    that:
+      - unmount_result['changed']
+      - dest_stat['stat']['exists']
+  when: ansible_system in ('FreeBSD', 'Linux')
+
+# unmount
 - name: Unmount the bind mount
  ansible.posix.mount:
    name: '{{ output_dir }}/mount_dest'
@@ -223,9 +325,36 @@
      - not dest_stat['stat']['exists']
  when: ansible_system in ('FreeBSD', 'Linux')

- name: Block to test remounted option
+# SWAP #############################################################
+- name: Swap
  when: ansible_system in ('Linux')
  block:
+    # mount swap check mode
+    - name: Stat /etc/fstab
+      ansible.builtin.stat:
+        path: /etc/fstab
+      register: stat_fstab_before
+
+    - name: Create fstab record for the first swap file (check mode)
+      ansible.posix.mount:
+        name: none
+        src: /tmp/swap1
+        opts: sw
+        fstype: swap
+        state: present
+      check_mode: true
+
+    - name: Stat /etc/fstab
+      ansible.builtin.stat:
+        path: /etc/fstab
+      register: stat_fstab_after
+
+    - name: Assert that fstab checksum did not change
+      ansible.builtin.assert:
+        that:
+          - stat_fstab_before.stat.checksum == stat_fstab_after.stat.checksum
+
+    # mount swap1
    - name: Create fstab record for the first swap file
      ansible.posix.mount:
        name: none
@@ -250,6 +379,7 @@
          - swap1_created['changed']
          - not swap1_created_again['changed']

+    # mount swap2
    - name: Create fstab record for the second swap file
      ansible.posix.mount:
        name: none
@@ -274,6 +404,30 @@
          - swap2_created['changed']
          - not swap2_created_again['changed']

+    # remove swap check mode
+    - name: Stat /etc/fstab
+      ansible.builtin.stat:
+        path: /etc/fstab
+      register: stat_fstab_before
+
+    - name: Remove the fstab record for the first swap file (check mode)
+      ansible.posix.mount:
+        name: none
+        src: /tmp/swap1
+        state: absent
+      check_mode: true
+
+    - name: Stat /etc/fstab
+      ansible.builtin.stat:
+        path: /etc/fstab
+      register: stat_fstab_after
+
+    - name: Assert that fstab checksum did not change
+      ansible.builtin.assert:
+        that:
+          - stat_fstab_before.stat.checksum == stat_fstab_after.stat.checksum
+
+    # remove swap1
    - name: Remove the fstab record for the first swap file
      ansible.posix.mount:
        name: none
@@ -294,6 +448,7 @@
          - swap1_removed['changed']
          - not swap1_removed_again['changed']

+    # remove swap2
    - name: Remove the fstab record for the second swap file
      ansible.posix.mount:
        name: none
@@ -314,6 +469,10 @@
          - swap2_removed['changed']
          - not swap2_removed_again['changed']

+# FIXUP #############################################################
+- name: Fix incomplete entry already present in fstab
+  when: ansible_system == 'Linux'
+  block:
    - name: Create fstab record with missing last two fields
      ansible.builtin.copy:
        dest: /etc/fstab
@@ -343,6 +502,11 @@
          - ''' 0 0'' in optional_fields_content.stdout'
          - 1 == optional_fields_content.stdout_lines | length

+# REMOUNTED #############################################################
+- name: Block to test remounted option
+  when: ansible_system in ('Linux')
+  block:
+    # setup
    - name: Create empty file
      community.general.filesize:
        path: /tmp/myfs.img
@@ -372,6 +536,26 @@
      ansible.builtin.pause:
        seconds: 2

+    # remount check mode
+    - name: Remount (check mode)
+      ansible.posix.mount:
+        path: /tmp/myfs
+        state: remounted
+
+    - name: Get again the last write time
+      ansible.builtin.shell:
+        cmd: >-
+          set -o pipefail && dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i "last write time:" |cut -d: -f2-
+        executable: "{{ shell_executable }}"
+      changed_when: false
+      register: last_write_time_check
+
+    - name: Fail if they are different
+      ansible.builtin.fail:
+        msg: Filesytem was remounted, testing of the module failed!
+      when: last_write_time.stdout != last_write_time_check.stdout
+
+    # remount
    - name: Test if the FS is remounted
      ansible.posix.mount:
        path: /tmp/myfs
@@ -390,6 +574,29 @@
        msg: Filesytem was not remounted, testing of the module failed!
      when: last_write is defined and last_write_time2 is defined and last_write_time.stdout == last_write_time2.stdout

+    # remount different options check mode
+    - name: Remount filesystem with different opts using remounted option (Linux only)
+      ansible.posix.mount:
+        path: /tmp/myfs
+        state: remounted
+        opts: rw,noexec
+      check_mode: true
+
+    - name: Get remounted options (Linux only)
+      ansible.builtin.shell:
+        cmd: set -o pipefail && mount | grep myfs | grep -E -w 'noexec' | wc -l
+        executable: "{{ shell_executable }}"
+      failed_when: false
+      changed_when: false
+      register: remounted_options
+
+    - name: Make sure the filesystem now has the new opts after using remounted (Linux only)
+      ansible.builtin.assert:
+        that:
+          - "'0' in remounted_options.stdout"
+          - "1 == remounted_options.stdout_lines | length"
+
+    # remount different options
    - name: Remount filesystem with different opts using remounted option (Linux only)
      ansible.posix.mount:
        path: /tmp/myfs
@@ -409,6 +616,7 @@
          - "'1' in remounted_options.stdout"
          - "1 == remounted_options.stdout_lines | length"

+    # backup
    - name: Mount the FS again to test backup
      ansible.posix.mount:
        path: /tmp/myfs
@@ -439,9 +647,11 @@
        - /tmp/myfs.img
        - /tmp/myfs

+# BOOT #############################################################
 - name: Block to test boot option for Linux
  when: ansible_system in ('Linux')
  block:
+    # setup
    - name: Create empty file
      community.general.filesize:
        path: /tmp/myfs.img
@@ -452,6 +662,7 @@
        fstype: ext3
        dev: /tmp/myfs.img

+    # noauto
    - name: Mount the FS with noauto option
      ansible.posix.mount:
        path: /tmp/myfs
@@ -472,6 +683,7 @@
        path: /tmp/myfs
        state: absent

+    # noauto + defaults
    - name: Mount the FS with noauto option and defaults
      ansible.posix.mount:
        path: /tmp/myfs
@@ -499,6 +711,7 @@
        - /tmp/myfs.img
        - /tmp/myfs

+# NEWLINE END OF FILE ############################################
 - name: Block to test missing newline at the EOF of fstab
  when: ansible_system in ('Linux')
  block:
@@ -537,6 +750,7 @@
        - /tmp/myfs1
        - /tmp/test_fstab

+# EPHEMERAL ################################################
 - name: Block to test ephemeral option
  environment:
    PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -552,8 +766,7 @@
        path: /tmp/myfs_B.img
        size: 20M

-  ##### FORMAT FS ON LINUX
-
+    ##### FORMAT FS ON LINUX
    - name: Block to format FS on Linux
      when: ansible_system == 'Linux'
      block:
@@ -567,8 +780,7 @@
            fstype: ext3
            dev: /tmp/myfs_B.img

-  ##### FORMAT FS ON SOLARIS AND BSD
-
+    ##### FORMAT FS ON SOLARIS AND BSD
    - name: Create loop devices on Solaris and BSD
      ansible.builtin.shell:
        cmd: "set -o pipefail && {{ ephemeral_create_loop_dev_cmd }}"
@@ -583,14 +795,49 @@
      changed_when: true
      when: ephemeral_format_fs_cmd is defined

-  ##### TESTS
-
    - name: Create fstab if it does not exist
      ansible.builtin.file:
        path: "{{ ephemeral_fstab }}"
        state: touch
        mode: '0644'

+    # normal ephemeral mount check mode
+    - name: Get checksum of /etc/fstab before mounting anything
+      ansible.builtin.stat:
+        path: '{{ ephemeral_fstab }}'
+      register: fstab_stat_before_mount
+
+    - name: Mount the FS A with ephemeral state (check mode)
+      ansible.posix.mount:
+        path: /tmp/myfs
+        src: '{{ ephemeral_device_a }}'
+        fstype: '{{ ephemeral_fstype }}'
+        opts: rw
+        state: ephemeral
+      register: ephemeral_mount_info
+      check_mode: true
+
+    - name: Get checksum of /etc/fstab after an ephemeral mount
+      ansible.builtin.stat:
+        path: '{{ ephemeral_fstab }}'
+      register: fstab_stat_after_mount
+
+    - name: Get mountinfo
+      ansible.builtin.shell:
+        cmd: grep -c '/tmp/myfs' <(mount -v)
+        executable: "{{ shell_executable }}"
+      register: check_mountinfo
+      failed_when: false
+      changed_when: false
+
+    - name: Assert the mount occurred and the fstab is unchanged
+      ansible.builtin.assert:
+        that:
+          - check_mountinfo.stdout|int == 0
+          - ephemeral_mount_info['changed']
+          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']
+
+    # normal ephemeral mount
    - name: Get checksum of /etc/fstab before mounting anything
      ansible.builtin.stat:
        path: '{{ ephemeral_fstab }}'
@@ -631,6 +878,48 @@
          - ephemeral_mount_info['changed']
          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']

+    # remount different options check mode
+    - name: Get first mount record
+      ansible.builtin.shell:
+        cmd: grep '/tmp/myfs' <(mount -v)
+        executable: "{{ shell_executable }}"
+      register: ephemeral_mount_record_1
+      changed_when: false
+
+    - name: Try to mount FS A where FS A is already mounted (should trigger remount and changed)
+      ansible.posix.mount:
+        path: /tmp/myfs
+        src: '{{ ephemeral_device_a }}'
+        fstype: '{{ ephemeral_fstype }}'
+        opts: ro
+        state: ephemeral
+      register: ephemeral_mount_info
+      check_mode: true
+
+    - name: Get second mount record (should be different than the first)
+      ansible.builtin.shell:
+        cmd: grep '/tmp/myfs' <(mount -v)
+        executable: "{{ shell_executable }}"
+      register: ephemeral_mount_record_2
+      changed_when: false
+
+    - name: Get mountinfo
+      ansible.builtin.shell:
+        cmd: grep -c '/tmp/myfs' <(mount -v)
+        executable: "{{ shell_executable }}"
+      failed_when: false
+      register: check_mountinfo
+      changed_when: false
+
+    - name: Assert the FS A is still mounted, the options unchanged and the fstab unchanged
+      ansible.builtin.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']
+
+    # remount different options
    - name: Get first mount record
      ansible.builtin.shell:
        cmd: grep '/tmp/myfs' <(mount -v)
@@ -670,6 +959,7 @@
          - ephemeral_mount_info['changed']
          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']

+    # conflicting mount
    - name: Try to mount file B on file A mountpoint (should fail)
      ansible.posix.mount:
        path: /tmp/myfs
@@ -707,6 +997,39 @@
          - test_file_stat['stat']['exists']
          - ephemeral_mount_b_info is failed

+    # unmount check mode
+    - name: Unmount FS with state = unmounted
+      ansible.posix.mount:
+        path: /tmp/myfs
+        state: unmounted
+      check_mode: true
+
+    - name: Get fstab checksum after unmounting an ephemeral mount with state = unmounted
+      ansible.builtin.stat:
+        path: '{{ ephemeral_fstab }}'
+      register: fstab_stat_after_unmount
+
+    - name: Get mountinfo
+      ansible.builtin.shell:
+        cmd: grep -c '/tmp/myfs' <(mount -v)
+        executable: "{{ shell_executable }}"
+      register: check_mountinfo
+      failed_when: false
+      changed_when: false
+
+    - name: Try to stat our test file
+      ansible.builtin.stat:
+        path: /tmp/myfs/test_file
+      register: test_file_stat
+
+    - name: Assert that unmount did not take place and fstab unchanged
+      ansible.builtin.assert:
+        that:
+          - check_mountinfo.stdout|int == 1
+          - test_file_stat['stat']['exists']
+          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_unmount['stat']['checksum']
+
+    # unmount
    - name: Unmount FS with state = unmounted
      ansible.posix.mount:
        path: /tmp/myfs
@@ -759,6 +1082,7 @@
        - /tmp/myfs_B.img
        - /tmp/myfs

+# OPTS_NO_LOG ######################################
 - name: Block to test opts_no_log option
  when: ansible_system == 'Linux'
  block:
--- a/tests/integration/targets/seboolean/tasks/main.yml
+++ b/tests/integration/targets/seboolean/tasks/main.yml
@@ -20,5 +20,4 @@
  ansible.builtin.include_tasks: seboolean.yml
  when:
    - ansible_selinux is defined
-    - ansible_selinux
    - ansible_selinux.status == 'enabled'
--- a/tests/integration/targets/selinux/tasks/main.yml
+++ b/tests/integration/targets/selinux/tasks/main.yml
@@ -19,23 +19,21 @@
 - name: Debug message for when SELinux is disabled
  ansible.builtin.debug:
    msg: SELinux is disabled
-  when: ansible_selinux is defined and not ansible_selinux
+  when: ansible_selinux is defined and ansible_selinux.status == 'disabled'

 - name: Debug message for when SELinux is enabled and not disabled
  ansible.builtin.debug:
    msg: SELinux is {{ ansible_selinux.status }}
-  when: ansible_selinux is defined and ansible_selinux
+  when: ansible_selinux is defined

 - name: Include_tasks for when SELinux is enabled
  ansible.builtin.include_tasks: selinux.yml
  when:
    - ansible_selinux is defined
-    - ansible_selinux
    - ansible_selinux.status == 'enabled'

 - name: Include tasks for selogin when SELinux is enabled
  ansible.builtin.include_tasks: selogin.yml
  when:
    - ansible_selinux is defined
-    - ansible_selinux
    - ansible_selinux.status == 'enabled'
--- a/tests/integration/targets/sysctl/tasks/main.yml
+++ b/tests/integration/targets/sysctl/tasks/main.yml
@@ -140,8 +140,8 @@
      ansible.posix.sysctl:
        name: test.invalid
        value: 1
-      register: sysctl_test3
      ignore_errors: true
+      register: sysctl_test3

    - name: Debug sysctl_test3
      ansible.builtin.debug:
@@ -229,6 +229,91 @@
      ansible.builtin.assert:
        that:
          - sysctl_test4 is failed
+        
+      ##
+      ## sysctl --system
+      ##
+
+    - name: Set vm.swappiness to 10 with --system option
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 10
+        state: present
+        reload: false
+        sysctl_set: true
+        system_wide: true
+      register: sysctl_system_test1
+
+    - name: Check with sysctl command
+      ansible.builtin.command: sysctl vm.swappiness
+      changed_when: false
+      register: sysctl_check_system1
+
+    - name: Debug sysctl_system_test1 sysctl_check_system1
+      ansible.builtin.debug:
+        var: item
+        verbosity: 1
+      with_items:
+        - "{{ sysctl_system_test1 }}"
+        - "{{ sysctl_check_system1 }}"
+
+    - name: Validate results for --system option
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_test1 is changed
+          - "'10' in sysctl_check_system1.stdout"
+
+    # Test system_wide with reload=true
+    - name: Set vm.dirty_ratio to 20 with system_wide and reload=true
+      ansible.posix.sysctl:
+        name: vm.dirty_ratio
+        value: 20
+        state: present
+        reload: true
+        system_wide: true
+      register: sysctl_system_reload_test
+
+    - name: Check vm.dirty_ratio value
+      ansible.builtin.command: sysctl -n vm.dirty_ratio
+      changed_when: false
+      register: sysctl_check_dirty_ratio
+
+    - name: Validate system_wide with reload
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_reload_test is changed
+          - sysctl_check_dirty_ratio.stdout == "20"
+
+    # Test system_wide=false behavior (default)
+    - name: Create custom sysctl file for testing
+      ansible.builtin.copy:
+        content: |
+          # Custom sysctl test file
+          vm.dirty_background_ratio=5
+        dest: "{{ output_dir_test }}/custom_sysctl.conf"
+        mode: "0644"
+
+    - name: Set vm.dirty_background_ratio with system_wide=false
+      ansible.posix.sysctl:
+        name: vm.dirty_background_ratio
+        value: 10
+        state: present
+        reload: true
+        system_wide: false
+        sysctl_file: "{{ output_dir_test }}/custom_sysctl.conf"
+      register: sysctl_system_false_test
+
+    - name: Check custom sysctl file content
+      ansible.builtin.command: cat {{ output_dir_test }}/custom_sysctl.conf
+      changed_when: false
+      register: custom_sysctl_content
+
+    - name: Validate system_wide=false behavior
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_false_test is changed
+          - "'vm.dirty_background_ratio=10' in custom_sysctl_content.stdout"
+

 - name: Test on RHEL VMs
  when:
@@ -366,3 +451,36 @@
        that:
          - stat_result.stat.islnk is defined and stat_result.stat.islnk
          - stat_result.stat.lnk_source == '/tmp/ansible_sysctl_test.conf'
+    
+    # Test sysctl: --system
+    - name: Set vm.swappiness to 10 with --system option
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 10
+        state: present
+        reload: false
+        sysctl_set: true
+        system_wide: true
+      register: sysctl_system_test1
+
+    - name: Check with sysctl command
+      ansible.builtin.command: sysctl vm.swappiness
+      changed_when: false
+      register: sysctl_check_system1
+
+    - name: Debug sysctl_system_test1 sysctl_check_system1
+      ansible.builtin.debug:
+        var: item
+        verbosity: 1
+      with_items:
+        - "{{ sysctl_system_test1 }}"
+        - "{{ sysctl_check_system1 }}"
+
+    - name: Validate results for --system option
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_test1 is changed
+          - sysctl_check_system1.stdout_lines == ["vm.swappiness = 10"]
+
+- name: Include system_wide specific tests
+  ansible.builtin.include_tasks: system_wide_tests.yml
--- a/tests/integration/targets/sysctl/tasks/system_wide_tests.yml
+++ b/tests/integration/targets/sysctl/tasks/system_wide_tests.yml
@@ -0,0 +1,203 @@
+---
+# Additional tests specifically for system_wide parameter functionality
+
+- name: Test system_wide parameter basic functionality
+  block:
+    # Test system_wide with a simple sysctl parameter
+    - name: Set vm.swappiness with system_wide=true (first time)
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 35
+        state: present
+        reload: false
+        system_wide: true
+      register: sysctl_system_wide_first_test
+
+    - name: Debug first test result
+      ansible.builtin.debug:
+        var: sysctl_system_wide_first_test
+
+    - name: Set vm.swappiness with system_wide=true (second time - should not change)
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 35
+        state: present
+        reload: false
+        system_wide: true
+      register: sysctl_system_wide_second_test
+
+    - name: Debug second test result
+      ansible.builtin.debug:
+        var: sysctl_system_wide_second_test
+
+    - name: Validate system_wide basic functionality
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_first_test is changed
+          - sysctl_system_wide_second_test is not changed
+
+    # Test system_wide with reload=true
+    - name: Set vm.dirty_expire_centisecs with system_wide=true and reload
+      ansible.posix.sysctl:
+        name: vm.dirty_expire_centisecs
+        value: 3000
+        state: present
+        reload: true
+        system_wide: true
+      register: sysctl_system_wide_reload_test
+
+    - name: Check vm.dirty_expire_centisecs value
+      ansible.builtin.command: sysctl -n vm.dirty_expire_centisecs
+      changed_when: false
+      register: sysctl_check_dirty_expire
+
+    - name: Validate system_wide with reload=true
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_reload_test is changed
+          - sysctl_check_dirty_expire.stdout == "3000"
+
+    # Test system_wide=false behavior (default)
+    - name: Create custom sysctl file for testing system_wide=false
+      ansible.builtin.copy:
+        content: |
+          # Custom sysctl test file
+          vm.dirty_background_ratio=5
+        dest: "{{ output_dir_test }}/custom_sysctl.conf"
+        mode: "0644"
+
+    - name: Set vm.dirty_background_ratio with system_wide=false
+      ansible.posix.sysctl:
+        name: vm.dirty_background_ratio
+        value: 10
+        state: present
+        reload: true
+        system_wide: false
+        sysctl_file: "{{ output_dir_test }}/custom_sysctl.conf"
+      register: sysctl_system_false_test
+
+    - name: Check custom sysctl file content
+      ansible.builtin.command: cat {{ output_dir_test }}/custom_sysctl.conf
+      changed_when: false
+      register: custom_sysctl_content
+
+    - name: Validate system_wide=false behavior
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_false_test is changed
+          - "'vm.dirty_background_ratio=10' in custom_sysctl_content.stdout"
+
+    # Test system_wide with check mode
+    - name: Test system_wide in check mode
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 25
+        state: present
+        reload: true
+        system_wide: true
+      check_mode: true
+      register: sysctl_system_wide_check_mode
+
+    - name: Validate check mode works with system_wide
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_check_mode is changed
+
+    # Test system_wide with missing directories (should not fail)
+    - name: Test system_wide with potentially missing directories
+      ansible.posix.sysctl:
+        name: vm.overcommit_memory
+        value: 1
+        state: present
+        reload: true
+        system_wide: true
+        ignoreerrors: true
+      register: sysctl_system_wide_missing_dirs
+
+    - name: Validate system_wide handles missing directories
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_missing_dirs is not failed
+
+- name: Test system_wide with multiple configuration files (RHEL/CentOS only)
+  when:
+    - ansible_facts.os_family == 'RedHat'
+    - ansible_facts.virtualization_type != 'docker'
+  block:
+    # Test that system_wide processes multiple configuration files
+    - name: Create test sysctl.d file
+      ansible.builtin.copy:
+        content: |
+          # Test system-wide sysctl reload
+          vm.dirty_writeback_centisecs=500
+        dest: /etc/sysctl.d/99-ansible-test.conf
+        mode: "0644"
+        backup: true
+      register: test_sysctl_file
+
+    - name: Apply setting with system_wide to test multiple file processing
+      ansible.posix.sysctl:
+        name: vm.overcommit_memory
+        value: 1
+        state: present
+        reload: true
+        system_wide: true
+      register: sysctl_multifile_test
+
+    - name: Verify both settings are applied
+      ansible.builtin.shell: |
+        sysctl -n vm.dirty_writeback_centisecs
+        sysctl -n vm.overcommit_memory
+      changed_when: false
+      register: sysctl_multifile_check
+
+    - name: Validate multiple file processing
+      ansible.builtin.assert:
+        that:
+          - sysctl_multifile_test is changed
+          - "'500' in sysctl_multifile_check.stdout"
+          - "'1' in sysctl_multifile_check.stdout"
+
+    - name: Cleanup test sysctl.d file
+      ansible.builtin.file:
+        path: /etc/sysctl.d/99-ansible-test.conf
+        state: absent
+
+- name: Test system_wide parameter combinations
+  block:
+    # Test system_wide with sysctl_set
+    - name: Test system_wide with sysctl_set=true
+      ansible.posix.sysctl:
+        name: vm.swappiness
+        value: 15
+        state: present
+        reload: true
+        system_wide: true
+        sysctl_set: true
+      register: sysctl_system_wide_set_test
+
+    - name: Check vm.swappiness value after system_wide + sysctl_set
+      ansible.builtin.command: sysctl -n vm.swappiness
+      changed_when: false
+      register: sysctl_check_swappiness_set
+
+    - name: Validate system_wide with sysctl_set
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_set_test is changed
+          - sysctl_check_swappiness_set.stdout == "15"
+
+    # Test system_wide with reload=false (should not trigger system reload)
+    - name: Test system_wide with reload=false
+      ansible.posix.sysctl:
+        name: vm.dirty_ratio
+        value: 25
+        state: present
+        reload: false
+        system_wide: true
+      register: sysctl_system_wide_no_reload
+
+    - name: Validate system_wide with reload=false
+      ansible.builtin.assert:
+        that:
+          - sysctl_system_wide_no_reload is changed
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -62,15 +62,15 @@ else
    retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
 fi

-export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
+export ANSIBLE_COLLECTIONS_PATH="${PWD}/../../../"

 # 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"
+    retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/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"
+    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/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)
 # END: HACK
Author	SHA1	Message	Date
mubashirusman	19d18efeb0	Merge `cd6d33b1c0` into `6da1331018`	2025-09-08 08:13:37 +00:00
mubashirusman	cd6d33b1c0	Merge branch 'ansible-collections:main' into main	2025-09-08 10:13:34 +02:00
softwarefactory-project-zuul[bot]	6da1331018	Merge pull request #670 from felixfontein/deprecations Use module.warn() instead of returning warnings SUMMARY Returning warnings as warnings has been deprecated. Ref: #635. ISSUE TYPE Bugfix Pull Request COMPONENT NAME firewalld_info mount Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-08-16 01:03:30 +00:00
mubashir.Ijaz	2d2df3989e	assertion checks	2025-08-11 17:19:39 +02:00
mubashir.Ijaz	df8413f3a0	fix try with invalid name	2025-08-08 17:43:48 +02:00
mubashir.Ijaz	f434c19e1e	test assertion syntax	2025-08-08 17:32:06 +02:00
mubashir.Ijaz	481de3d2dc	Validate results for --system option	2025-08-08 17:11:15 +02:00
mubashir.Ijaz	ae90bac688	Try sysctl with an invalid name	2025-08-08 16:48:00 +02:00
mubashir.Ijaz	80290d8e06	reload: false in docker tests	2025-08-08 16:32:43 +02:00
mubashir.Ijaz	560afe8217	handle ignoreerrors consistently	2025-08-08 16:13:08 +02:00
mubashir.Ijaz	571e80cdba	ansible lint	2025-08-08 16:02:15 +02:00
mubashir.Ijaz	9ce933f7d0	remove trailing whitespaces	2025-08-08 15:45:45 +02:00
mubashir.Ijaz	7f8505d693	system_wide fix	2025-08-07 23:31:05 +02:00
mubashir.Ijaz	2f5210f362	Add integration system_wide tests	2025-08-07 17:47:24 +02:00
mubashirusman	a91bbf6c04	Merge branch 'ansible-collections:main' into main	2025-08-07 17:25:01 +02:00
Felix Fontein	ab8dfefd90	Use module.warn() instead of returning warnings.	2025-08-06 06:49:32 +02:00
softwarefactory-project-zuul[bot]	b96fad5e5b	Merge pull request #673 from saito-hideki/pr/ci_update_20250805 [AZP] Update CI matrix SUMMARY Update AZP CI matrix: Addresses #672 Bump test container version 7.0.0 Removes Ansible Core 2.15 tests. Python 3.11 is no longer supported in Container 7.0.0. ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-08-05 23:44:46 +00:00
saito-hideki	2d350e6073	AZP update CI matrix * Addresses #672 * Bump test container version 7.0.0 * Removes Ansible Core 2.15 tests. Python 3.11 is no longer supported in Container 7.0.0. Signed-off-by: saito-hideki <saito@fgrep.org>	2025-08-05 14:30:30 +09:00
softwarefactory-project-zuul[bot]	ea6ef5c775	Merge pull request #665 from saito-hideki/pr/readme_20250728 Update README for release of Ansible Core 2.19 SUMMARY README updated with the release of Ansible Core 2.19 https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_19.html ISSUE TYPE Docs Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A	2025-07-28 08:38:22 +00:00
saito-hideki	9007e20b2f	README updated with the release of Ansible Core 2.19 * https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_19.html Signed-off-by: saito-hideki <saito@fgrep.org>	2025-07-28 17:12:02 +09:00
softwarefactory-project-zuul[bot]	508e3d920f	Merge pull request #666 from saito-hideki/pr/azp_update_matrix_20250728 [AZP][CI] Update AZP matrix to follow ansible-test changes SUMMARY Update AZP matrix to follow ansible-test changes ansible/ansible/pull/85558 ansible/ansible/pull/85561 ansible/ansible/pull/85562 ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-28 06:32:06 +00:00
saito-hideki	18e023dd77	Update AZP matrix to follow ansible-test changes * https://github.com/ansible/ansible/pull/85558 * https://github.com/ansible/ansible/pull/85561 * https://github.com/ansible/ansible/pull/85562 Signed-off-by: saito-hideki <saito@fgrep.org>	2025-07-28 14:59:14 +09:00
softwarefactory-project-zuul[bot]	d3204df536	Merge pull request #660 from saito-hideki/pr_azp_syntax [AZP] Fixed syntax error in AZP settings SUMMARY Fixed syntax error in AZP settings ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-17 03:39:40 +00:00
Hideki SAITO	162e72182f	Fixed syntax error in azurepileline settings Signed-off-by: Hideki SAITO <hsaito@macallan.home.fgrep.org>	2025-07-17 12:16:09 +09:00
softwarefactory-project-zuul[bot]	1c1dd005c8	Merge pull request #654 from saito-hideki/pr/bump_core_version_220 [CI] bump ansible-core version to 2.20 for devel branch SUMMARY Bump ansible-core version to 2.20 for devel branch. Bump devel test to ansible-core 2.19 Add ansible-core 2.18 to the stable list ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-10 01:00:47 +00:00
saito-hideki	40c27e2bee	CI - bump ansible-core version * bump devel to ansible-core 2.20 * add ansible-core 2.19 to stable list Signed-off-by: saito-hideki <saito@fgrep.org>	2025-07-10 09:35:28 +09:00
softwarefactory-project-zuul[bot]	c273ac2a01	Merge pull request #650 from felixfontein/callback profile_* callbacks: avoid deprecated/deleted functions SUMMARY The profile_roles and profile_tasks callbacks define methods playbook_on_setup and playbook_on_stats which have been deleted/deprecated: playbook_on_stats has been deprecated, v2_playbook_on_stats should be used instead (that one has already been there for many years: ansible/ansible@ba0e532 was added in 2015). playbook_on_setup has been deleted (ansible/ansible@eec57ec), and its v2 variant was already deleted in 2017: ansible/ansible@59d5481 Ref: #635 ISSUE TYPE Bugfix Pull Request Feature Pull Request COMPONENT NAME profile_roles profile_tasks Reviewed-by: Abhijeet Kasurde Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-07-08 05:47:53 +00:00
Felix Fontein	f978998521	Add changelog fragment.	2025-06-28 16:34:47 +02:00
Felix Fontein	c319c856ed	Avoid deprecated/deleted callback functions.	2025-06-28 16:29:29 +02:00
softwarefactory-project-zuul[bot]	cdb442ea48	Merge pull request #646 from saito-hideki/issue/642 [AZP] Add RHEL10 environment to CI matrix SUMMARY Add RHEL10 environment to CI matrix Fixes #642 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A	2025-06-09 10:07:53 +00:00
saito-hideki	f977bffff2	[AZP] Add RHEL10 environment to CI matrix * Fixes #642 Signed-off-by: saito-hideki <saito@fgrep.org>	2025-06-09 18:43:43 +09:00
softwarefactory-project-zuul[bot]	dabaca4b70	Merge pull request #640 from Klaas-/Klaas-fixCI Remove EOL FreeBSD 13.2 from CI SUMMARY CI seems to be failing for a month, reason is that freebsd 13.2 is no longer valid. See ansible-collections/community.general#8607 ISSUE TYPE Bugfix Pull Request COMPONENT NAME CI Reviewed-by: Felix Fontein <felix@fontein.de> Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-05-20 00:22:19 +00:00
Klaas Demter	26b9b1438d	Remove EOL FreeBSD 13.2 from CI	2025-05-19 18:10:38 +02:00
softwarefactory-project-zuul[bot]	1994b2cf1c	Merge pull request #626 from pablomh/datetime_format plugins/callback/profile_tasks.py: Add option to provide a different date/time format SUMMARY The new datetime_format key will offer the possibility of providing a different date/time format than the default one ('%A %d %B %Y %H:%M:%S %z'). The iso8601 value can be used as an '%Y-%m-%dT%H:%M:%S.%f' alias (format of the ISO 8601 date/time standard). The code has changed from using the time API to the datetime one in order to support sub-second precision (needed by the ISO 8601 format, for example). Fixes: #279 ISSUE TYPE Feature Pull Request COMPONENT NAME plugins/callback/profile_tasks.py ADDITIONAL INFORMATION Output with no key which keeps current behavior: TASK [Import subscription manifest] ***************************************************************************************************************************************************************************************************************************************************************** Thursday 10 April 2025 00:52:11 +0200 (0:00:17.416) 0:00:17.453 **** changed: [localhost] Output with datetime_format = 'iso8601': TASK [Import subscription manifest] *************************************************************************************************************************************************************************************************************************************************************** 2025-04-10T00:55:19.967718 (0:00:15.664) 0:00:15.691 **************** changed: [localhost] Output with datetime_format = '%Y-%m-%dT%H:%M:%S.%f%z' (ISO 8601 with UTC offset information): TASK [Import subscription manifest] *************************************************************************************************************************************************************************************************************************************************************** 2025-04-10T00:57:49.290347+0200 (0:00:16.265) 0:00:16.293 ************* changed: [localhost] Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-04-25 06:44:25 +00:00
Pablo Méndez Hernández	2f224e6a6a	Add option to provide a different date/time format The new `datetime_format` key will offer the possibility of providing a different date/time format than the default one (`'%A %d %B %Y %H:%M:%S %z'`). - The `iso8601` value can be used as an `'%Y-%m-%dT%H:%M:%S.%f'` alias (format of the ISO 8601 date/time standard). The code has changed from using the `time` API to the `datetime` one in order to support sub-second precision (needed by the ISO 8601 format, for example). Signed-off-by: Pablo Mendez Hernandez <pablomh@redhat.com>	2025-04-17 15:57:00 +02:00
softwarefactory-project-zuul[bot]	96ec2097cc	Merge pull request #631 from saito-hideki/issue/630 Fixes issue related to latest ansible-core devel branch SUMMARY Fixes a bug related to updating the ansible-core devel branch. Fixes incorrect load path for json module in cgroup_perf_recap Remove unnecessary condition from seboolean integration tests Optimize conditions for selinux integration tests Fixes #630 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ansible.posix.cgroup_perf_recap ADDITIONAL INFORMATION N/A	2025-04-17 00:34:06 +00:00
Hideki Saito	7b9b1f4957	Fixes issue related to updating the ansible-core devel branch * Fixes incorrect load path for json module in cgroup_perf_recap * Remove unnecessary condition from seboolean integration tests * Optimize conditions for selinux integration tests * Fixes #630 Signed-off-by: Hideki Saito <saito@fgrep.org>	2025-04-17 00:11:31 +00:00
softwarefactory-project-zuul[bot]	f0b5f039d3	Merge pull request #613 from simonLeary42/rewrite-mount-tests improve mount integration tests SUMMARY added check mode tests (assert no changes made) added comments to make file less scary ISSUE TYPE tests COMPONENT NAME mount ADDITIONAL INFORMATION Reviewed-by: Abhijeet Kasurde Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-04-10 03:58:40 +00:00
softwarefactory-project-zuul[bot]	5ceb40b600	Merge pull request #618 from saito-hideki/issie/612 [AZP] Remove ubuntu20.04 from CI tests SUMMARY Remove ubuntu20.04 from CI tests Fixes #612 ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-03-28 01:32:12 +00:00
Hideki Saito	2cec8cbed5	[CI] Remove ubuntu20.04 from CI tests * Fixes #612 Signed-off-by: Hideki Saito <saito@fgrep.org>	2025-03-28 10:04:16 +09:00
Pavel Knoblokh	1b8aeb03cb	sysctl: Add custom sysctl file example (#606 )	2025-03-26 19:21:08 -07:00
Abhijeet Kasurde	eead50b287	Apply suggestions from code review	2025-03-26 12:36:08 -07:00
Simon Leary	4ff0e3aa13	remove assertion of changed	2025-03-26 15:20:42 -04:00
Simon Leary	979f00ce75	fix lint errors	2025-03-26 15:18:35 -04:00
softwarefactory-project-zuul[bot]	ed3d322fd5	Merge pull request #617 from Akasurde/ci_fix [CI] update test containers SUMMARY Signed-off-by: Abhijeet Kasurde Akasurde@redhat.com ISSUE TYPE Bugfix Pull Request Reviewed-by: Matt Clay	2025-03-26 19:00:30 +00:00
Abhijeet Kasurde	d9f54eb9d4	[CI] update test containers Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>	2025-03-26 09:02:59 -07:00
Simon Leary	7d8da00f79	add (check mode) to task name	2025-03-06 10:46:57 -05:00
Simon Leary	f087d58cbe	fix bugs	2025-03-05 00:39:46 +00:00
Simon Leary	eb740e97d4	add check mode tests, add comments	2025-03-05 00:33:11 +00:00
softwarefactory-project-zuul[bot]	44a2151dbf	Merge pull request #604 from saito-hideki/pr/bump_up_version_3.0.0 Bump version to 3.0.0 for the next release SUMMARY Bump version to 3.0.0 for the next release on main branch: Fixes #603 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2024-12-10 08:59:03 +00:00
Hideki Saito	83288b9020	Bump version to 3.0.0 for the next release * Fixes #603 Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-12-10 17:30:22 +09:00
softwarefactory-project-zuul[bot]	4c6898ee6e	Merge pull request #600 from saito-hideki/release_2.0.0 Release 2.0.0 commit SUMMARY Release 2.0.0 commit Release Plan #149 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION This will be merged on 5 December if there are no problems Reviewed-by: Adam Miller <admiller@redhat.com> Reviewed-by: Andrew Klychkov <aklychko@redhat.com>	2024-12-05 00:48:30 +00:00
Hideki Saito	f5eae12146	Release 2.0.0 commit Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-12-04 09:46:44 +09:00
softwarefactory-project-zuul[bot]	f632fad9d4	Merge pull request #598 from saito-hideki/issue/586 [Breaking Change] [firewalld] Change type of icmp_block_inversion option from str to bool SUMMARY Changed the type of icmp_block_inversion option from str to bool Fixes #586 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ansible.posix.firewalld ADDITIONAL INFORMATION Related #582 and #584 Reviewed-by: Adam Miller <admiller@redhat.com> Reviewed-by: Andrew Klychkov <aklychko@redhat.com>	2024-12-02 23:50:26 +00:00
softwarefactory-project-zuul[bot]	74edb72249	Merge pull request #597 from vbotka/mount-fix-comment Remove comment from fstab entry on updating. SUMMARY Fix #595. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ansible.posix.mount ADDITIONAL INFORMATION Reviewed-by: Hideki Saito <saito@fgrep.org> Reviewed-by: Vladimir Botka <vbotka@gmail.com>	2024-11-29 02:59:28 +00:00
Vladimir Botka	91129ed381	Fix changelog fragment module name.	2024-11-29 03:34:14 +01:00
Vladimir Botka	7b8d627552	Changelog fragment added.	2024-11-28 08:17:41 +01:00
Hideki Saito	6175a5028b	Change type of icmp_block_inversion option from str to bool * Fixes #586 Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-11-28 14:19:20 +09:00
Vladimir Botka	8e34860d6c	Fix #595 . Remove comment from fstab entry on updating.	2024-11-21 20:54:27 +01:00
MubashirUsman	6280bb8ec8	Add integration test for --system option	2024-11-03 23:21:39 +01:00
mubashirusman	3b79155e68	Merge branch 'ansible-collections:main' into main	2024-11-03 23:07:55 +01:00
mubashirusman	05724a097b	Merge branch 'ansible-collections:main' into main	2024-10-15 22:26:52 +02:00
MubashirUsman	7e1b76c46e	write sysctl reverted	2024-05-19 17:47:12 +02:00
MubashirUsman	505a4aaa09	system_wide in defining module	2024-05-19 17:29:02 +02:00
MubashirUsman	d70d2aaaa7	read sysctl_dir files	2024-05-19 16:29:36 +02:00
MubashirUsman	806ff5c1a3	added sysctl_dirs variable and system_wide var	2024-05-19 13:54:43 +02:00