From 7b9b1f4957da395f3ed09835a9ce79a0932360ea Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Wed, 16 Apr 2025 05:38:49 +0000 Subject: [PATCH] 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 --- changelogs/fragments/631_fixes_module_path.yml | 6 ++++++ plugins/callback/cgroup_perf_recap.py | 3 ++- tests/integration/targets/seboolean/tasks/main.yml | 1 - tests/integration/targets/selinux/tasks/main.yml | 6 ++---- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/631_fixes_module_path.yml diff --git a/changelogs/fragments/631_fixes_module_path.yml b/changelogs/fragments/631_fixes_module_path.yml new file mode 100644 index 0000000..7aad317 --- /dev/null +++ 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). diff --git a/plugins/callback/cgroup_perf_recap.py b/plugins/callback/cgroup_perf_recap.py index d1f4247..6721a03 100644 --- 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 diff --git a/tests/integration/targets/seboolean/tasks/main.yml b/tests/integration/targets/seboolean/tasks/main.yml index 4aad585..97a41d1 100644 --- 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' diff --git a/tests/integration/targets/selinux/tasks/main.yml b/tests/integration/targets/selinux/tasks/main.yml index 8d8db05..0531064 100644 --- 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'