diff --git a/tasks/Debian-default.yml b/tasks/Debian-default.yml index 2d2f16a..8d20d2f 100644 --- a/tasks/Debian-default.yml +++ b/tasks/Debian-default.yml @@ -2,8 +2,8 @@ # tasks file for ensure_os_patch - name: 'ensure Debian patch' when: - - ansible_system == 'Linux' - - ansible_pkg_mgr == 'apt' + - ansible_facts["system"] == 'Linux' + - ansible_facts["pkg_mgr"]== 'apt' ansible.builtin.apt: autoclean: 'yes' autoremove: 'yes' @@ -13,4 +13,5 @@ - 'ensure_os_patch.service_facts' - name: 'flush handlers' meta: 'flush_handlers' +... diff --git a/tasks/main.yml b/tasks/main.yml index f0cfcf8..15eb575 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,52 +2,52 @@ # tasks file for ensure_os_patch - name: 'include vendor / version specific tasks' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_tasks: file: '{{ lookup("first_found", findme ) }}' 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_os_family }}-default.yml' + - '{{ 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_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' errors: 'ignore' - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_os_patch' 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_os_family }}-default.yml' + - '{{ 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_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/' errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - 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_os_patch is defined - ensure_os_patch.package_list is defined - ensure_os_patch.package_list is iterable @@ -62,8 +62,8 @@ - 'ensure_os_patch.service_facts' - name: 'ensure apt patch' when: - - ansible_system == 'Linux' - - ansible_pkg_mgr == 'apt' + - ansible_facts["system"] == 'Linux' + - ansible_facts["pkg_mgr"] == 'apt' ansible.builtin.apt: autoclean: 'yes' autoremove: 'yes' @@ -73,8 +73,8 @@ - 'ensure_os_patch.service_facts' - name: 'ensure dnf or yum patch' when: - - ansible_system == 'Linux' - - ansible_pkg_mgr == 'dnf' or ansible_pkg_mgr == 'dnf5' or ansible_pkg_mgr == 'yum' + - ansible_facts["system"] == 'Linux' + - ansible_facts["pkg_mgr"] == 'dnf' or ansible_facts["pkg_mgr"] == 'dnf5' or ansible_facts["pkg_mgr"] == 'yum' ansible.builtin.package: name: '*' state: 'latest' @@ -83,7 +83,7 @@ - 'ensure_os_patch.service_facts' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_os_patch is defined - ensure_os_patch.service_list is defined - ensure_os_patch.service_list is iterable diff --git a/vars/Fedora-21-default.yml b/vars/Fedora-21-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-21-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-22-default.yml b/vars/Fedora-22-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-22-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-23-default.yml b/vars/Fedora-23-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-23-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-24-default.yml b/vars/Fedora-24-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-24-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-25-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-26-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-27-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-28-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-29-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-30-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-31-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-32-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-33-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-34-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-35-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-36-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-37-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index 2945494..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf-automatic' - state: 'present' -service_list: - - name: 'dnf-automatic.timer' - state: 'started' - enabled: 'yes' -... - diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml deleted file mode 100644 index ddda6ef..0000000 --- a/vars/Fedora-41-default.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# vars file for ensure_os_patch -package_list: - - name: 'dnf5-plugin-automatic' - state: 'present' -service_list: - - name: 'dnf5-automatic.timer' - state: 'started' - enabled: 'yes' -...