From 17b4f96aca41566ef212dc8accbabe0af29891c2 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 14:10:43 -0500 Subject: [PATCH] Fix ansible core 2.20 and supported OS list Signed-off-by: Jason Rothstein --- tasks/main.yml | 30 +++++++++---------- ...4-default.yml => AlmaLinux-10-default.yml} | 0 ...35-default.yml => AlmaLinux-8-default.yml} | 0 ...36-default.yml => AlmaLinux-9-default.yml} | 0 ...a-37-default.yml => CentOS-10-default.yml} | 0 ...ra-38-default.yml => CentOS-8-default.yml} | 0 ...ra-39-default.yml => CentOS-9-default.yml} | 0 ...default.yml => OracleLinux-10-default.yml} | 0 ...-default.yml => OracleLinux-8-default.yml} | 0 vars/OracleLinux-9-default.yml | 9 ++++++ vars/Rocky-10-default.yml | 9 ++++++ vars/Rocky-8-default.yml | 9 ++++++ vars/Rocky-9-default.yml | 9 ++++++ 13 files changed, 51 insertions(+), 15 deletions(-) rename vars/{Fedora-34-default.yml => AlmaLinux-10-default.yml} (100%) rename vars/{Fedora-35-default.yml => AlmaLinux-8-default.yml} (100%) rename vars/{Fedora-36-default.yml => AlmaLinux-9-default.yml} (100%) rename vars/{Fedora-37-default.yml => CentOS-10-default.yml} (100%) rename vars/{Fedora-38-default.yml => CentOS-8-default.yml} (100%) rename vars/{Fedora-39-default.yml => CentOS-9-default.yml} (100%) rename vars/{Fedora-40-default.yml => OracleLinux-10-default.yml} (100%) rename vars/{Fedora-41-default.yml => OracleLinux-8-default.yml} (100%) create mode 100644 vars/OracleLinux-9-default.yml create mode 100644 vars/Rocky-10-default.yml create mode 100644 vars/Rocky-8-default.yml create mode 100644 vars/Rocky-9-default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 422c2ab..7f4b7a2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,18 +2,18 @@ # tasks file for ensure_selinux - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_selinux' vars: findme: files: - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_distribution }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - '{{ ansible_os_family }}-default.yml' - 'default.yml' paths: @@ -21,17 +21,17 @@ errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' - - packages is not defined + - ansible_facts["system"] == 'Linux' + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - services is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.package_list is defined - ensure_selinux.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_selinux.service_facts' - name: 'ensure configurations' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.template_list is defined - ensure_selinux.template_list is iterable @@ -71,7 +71,7 @@ - 'ensure_selinux.service_restart' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.service_list is defined - ensure_selinux.service_list is iterable @@ -87,7 +87,7 @@ - 'ensure_selinux.service_facts' - name: 'Ensure SELinux is configured' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.selinux_policy is defined - ensure_selinux.selinux_state is defined @@ -97,7 +97,7 @@ register: 'results' - name: 'Reboot if required' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.selinux_policy is defined - ensure_selinux.selinux_state is defined @@ -107,7 +107,7 @@ reboot: - name: 'ensure seboolean' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_selinux is defined - ensure_selinux.seboolean_list is defined - ensure_selinux.seboolean_list is iterable diff --git a/vars/Fedora-34-default.yml b/vars/AlmaLinux-10-default.yml similarity index 100% rename from vars/Fedora-34-default.yml rename to vars/AlmaLinux-10-default.yml diff --git a/vars/Fedora-35-default.yml b/vars/AlmaLinux-8-default.yml similarity index 100% rename from vars/Fedora-35-default.yml rename to vars/AlmaLinux-8-default.yml diff --git a/vars/Fedora-36-default.yml b/vars/AlmaLinux-9-default.yml similarity index 100% rename from vars/Fedora-36-default.yml rename to vars/AlmaLinux-9-default.yml diff --git a/vars/Fedora-37-default.yml b/vars/CentOS-10-default.yml similarity index 100% rename from vars/Fedora-37-default.yml rename to vars/CentOS-10-default.yml diff --git a/vars/Fedora-38-default.yml b/vars/CentOS-8-default.yml similarity index 100% rename from vars/Fedora-38-default.yml rename to vars/CentOS-8-default.yml diff --git a/vars/Fedora-39-default.yml b/vars/CentOS-9-default.yml similarity index 100% rename from vars/Fedora-39-default.yml rename to vars/CentOS-9-default.yml diff --git a/vars/Fedora-40-default.yml b/vars/OracleLinux-10-default.yml similarity index 100% rename from vars/Fedora-40-default.yml rename to vars/OracleLinux-10-default.yml diff --git a/vars/Fedora-41-default.yml b/vars/OracleLinux-8-default.yml similarity index 100% rename from vars/Fedora-41-default.yml rename to vars/OracleLinux-8-default.yml diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..b16597b --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,9 @@ +--- +# vars file for ensure_selinux +package_list: + - name: 'python3-libselinux' + state: 'present' + - name: 'python3-libsemanage' + state: 'present' +selinux_policy: 'targeted' +selinux_state: 'enforcing' diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..b16597b --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,9 @@ +--- +# vars file for ensure_selinux +package_list: + - name: 'python3-libselinux' + state: 'present' + - name: 'python3-libsemanage' + state: 'present' +selinux_policy: 'targeted' +selinux_state: 'enforcing' diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..b16597b --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,9 @@ +--- +# vars file for ensure_selinux +package_list: + - name: 'python3-libselinux' + state: 'present' + - name: 'python3-libsemanage' + state: 'present' +selinux_policy: 'targeted' +selinux_state: 'enforcing' diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..b16597b --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,9 @@ +--- +# vars file for ensure_selinux +package_list: + - name: 'python3-libselinux' + state: 'present' + - name: 'python3-libsemanage' + state: 'present' +selinux_policy: 'targeted' +selinux_state: 'enforcing'