More ansible core 2.20 fixes
Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
This commit is contained in:
+3
-3
@@ -6,14 +6,14 @@
|
||||
ansible.builtin.service_facts:
|
||||
- name: 'ensure_selinux.service_reload'
|
||||
when:
|
||||
- ansible_system == 'Linux'
|
||||
- ansible_service_mgr == 'systemd'
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["service_mgr"] == 'systemd'
|
||||
- ensure_selinux is defined
|
||||
ansible.builtin.systemd:
|
||||
daemon_reload: 'yes'
|
||||
- name: 'ensure_selinux.service_restart'
|
||||
when:
|
||||
- ansible_system == 'Linux'
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_selinux is defined
|
||||
- ensure_selinux.service_list is defined
|
||||
- ensure_selinux.service_list is iterable
|
||||
|
||||
+4
-4
@@ -12,9 +12,9 @@
|
||||
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["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_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||
- '{{ ansible_os_family }}-default.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-default.yml'
|
||||
- 'default.yml'
|
||||
paths:
|
||||
- '../vars/'
|
||||
@@ -27,7 +27,7 @@
|
||||
- name: 'service discovery'
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- services is not defined
|
||||
- ansible_facts["services"] is not defined
|
||||
ansible.builtin.service_facts:
|
||||
- name: 'ensure packages'
|
||||
when:
|
||||
|
||||
Reference in New Issue
Block a user