Fix ansible core 2.20 and supported OS list

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
This commit is contained in:
2026-05-05 18:15:09 -05:00
parent 419583f9f2
commit f1fc80e5de
13 changed files with 22 additions and 153 deletions
+3 -3
View File
@@ -6,14 +6,14 @@
ansible.builtin.service_facts: ansible.builtin.service_facts:
- name: 'ensure_podman.service_reload' - name: 'ensure_podman.service_reload'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ansible_service_mgr == 'systemd' - ansible_facts["service_mgr"] == 'systemd'
- ensure_podman is defined - ensure_podman is defined
ansible.builtin.systemd: ansible.builtin.systemd:
daemon_reload: 'yes' daemon_reload: 'yes'
- name: 'ensure_podman.service_restart' - name: 'ensure_podman.service_restart'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_podman is defined - ensure_podman is defined
- ensure_podman.service_list is defined - ensure_podman.service_list is defined
- ensure_podman.service_list is iterable - ensure_podman.service_list is iterable
+19 -19
View File
@@ -2,36 +2,36 @@
# tasks file for ensure_podman # tasks file for ensure_podman
- name: 'include variables' - name: 'include variables'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
include_vars: include_vars:
file: '{{ lookup("first_found", findme ) }}' file: '{{ lookup("first_found", findme ) }}'
name: 'ensure_podman' name: 'ensure_podman'
vars: vars:
findme: findme:
files: files:
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
- '{{ ansible_distribution }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml'
- '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
- '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
- '{{ ansible_os_family }}-default.yml' - '{{ ansible_facts["os_family"] }}-default.yml'
- 'default.yml' - 'default.yml'
paths: paths:
- '../vars/' - '../vars/'
errors: 'ignore' errors: 'ignore'
- name: 'package discovery' - name: 'package discovery'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- packages is not defined - ansible_facts["packages"] is not defined
ansible.builtin.package_facts: ansible.builtin.package_facts:
- name: 'service discovery' - name: 'service discovery'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- services is not defined - ansible_facts["services"] is not defined
ansible.builtin.service_facts: ansible.builtin.service_facts:
- name: 'ensure packages' - name: 'ensure packages'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_podman is defined - ensure_podman is defined
- ensure_podman.package_list is defined - ensure_podman.package_list is defined
- ensure_podman.package_list is iterable - ensure_podman.package_list is iterable
@@ -46,7 +46,7 @@
- 'ensure_podman.service_facts' - 'ensure_podman.service_facts'
- name: 'ensure services' - name: 'ensure services'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_podman is defined - ensure_podman is defined
- ensure_podman.service_list is defined - ensure_podman.service_list is defined
- ensure_podman.service_list is iterable - ensure_podman.service_list is iterable
@@ -62,10 +62,10 @@
- 'ensure_podman.service_facts' - 'ensure_podman.service_facts'
- name: 'Ensure cgroup v2 have not been disabled' - name: 'Ensure cgroup v2 have not been disabled'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_podman is defined - ensure_podman is defined
- ansible_distribution == 'Fedora' - ansible_facts["distribution"] == 'Fedora'
- ansible_distribution_major_version is version('32', '>=') - ansible_facts["distribution_major_version"] is version('32', '>=')
- ansible_cmdline is defined - ansible_cmdline is defined
- ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
shell: shell:
@@ -73,10 +73,10 @@
grubby --update-kernel=ALL --remove-args=systemd.unified_cgroup_hierarchy=0 grubby --update-kernel=ALL --remove-args=systemd.unified_cgroup_hierarchy=0
- name: 'Reboot to disable cgroups v1' - name: 'Reboot to disable cgroups v1'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_podman is defined - ensure_podman is defined
- ansible_distribution == 'Fedora' - ansible_facts["distribution"] == 'Fedora'
- ansible_distribution_major_version is version('32', '>=') - ansible_facts["distribution_major_version"] is version('32', '>=')
- ansible_cmdline is defined - ansible_cmdline is defined
- ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
reboot: reboot:
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-11
View File
@@ -1,11 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-13
View File
@@ -1,13 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
- name: 'podman-compose'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-13
View File
@@ -1,13 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
- name: 'podman-compose'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-13
View File
@@ -1,13 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
- name: 'podman-compose'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-13
View File
@@ -1,13 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
- name: 'podman-compose'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'
-13
View File
@@ -1,13 +0,0 @@
---
# vars file for ensure_podman
package_list:
- name: 'cockpit-podman'
state: 'present'
- name: 'podman'
state: 'present'
- name: 'podman-compose'
state: 'present'
service_list:
- name: 'podman.socket'
state: 'started'
enabled: 'yes'