Merge 6280bb8ec8 into 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
2026-01-11 15:15:26 +01:00 · 2025-07-10 10:13:15 +02:00 · 2025-07-10 01:00:47 +00:00 · 2025-07-10 09:35:28 +09:00 · 2024-11-03 23:21:39 +01:00 · 2024-11-03 23:07:55 +01:00
5 changed files with 150 additions and 12 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -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/{0OI}
+          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,10 +88,11 @@ 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
+        I
        parameters:
          nameFormat: "{0}"
          testFormat: 2.17/{0}
@ -88,7 +104,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
@ -101,7 +117,7 @@ stages:
            - name: Units
              test: units
  - stage: Sanity_2_15
-    displayName: Ansible 2.15 sanity
+    displayName: Ansible 2.15 sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -128,6 +144,20 @@ stages:
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
+  - stage: Docker_2_19
+    displayName: Docker 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: devel/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 2.18
    dependsOn: []
@ -203,6 +233,22 @@ stages:
              test: freebsd/14.2
            - name: FreeBSD 13.5
              test: freebsd/13.5
+  - stage: Remote_2_19
+    displayName: Remote 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: devel/{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 2.18
    dependsOn: []
@ -272,6 +318,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/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/plugins/modules/sysctl.py
+++ b/plugins/modules/sysctl.py
@ -108,6 +108,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
@ -121,12 +122,24 @@ 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
@ -306,15 +319,22 @@ 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):
+                        rc, out, err = self.module.run_command([self.sysctl_cmd, '-p', conf_file], 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
@ -401,7 +421,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/sysctl/tasks/main.yml
+++ b/tests/integration/targets/sysctl/tasks/main.yml
@ -229,6 +229,40 @@
      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: 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: Test on RHEL VMs
  when:
@ -366,3 +400,33 @@
        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: 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"]
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
Author	SHA1	Message	Date
mubashirusman	e612dc1e02	Merge `6280bb8ec8` into `1c1dd005c8`	2025-07-10 10:13:15 +02: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
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