From 18a389df0f1979d40648760304b830654bf7ea2f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Thu, 21 Mar 2024 11:42:58 -0400 Subject: [PATCH] Fix exceptions for better, more concise, functionality --- .ansible-lint | 2 ++ galaxy.yml | 2 +- roles/update_all_packages/tasks/main.yml | 18 +++++------------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index f60fd2b..e681a7b 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -4,3 +4,5 @@ skip_list: - yaml[line-length] - no-changed-when - galaxy[no-changelog] + - no-free-form + - package-latest diff --git a/galaxy.yml b/galaxy.yml index 0941842..b9a5b5d 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: jchristianh name: baseos # The version of the collection. Must be compatible with semantic versioning -version: 1.0.33 +version: 1.0.34 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/update_all_packages/tasks/main.yml b/roles/update_all_packages/tasks/main.yml index 55d5674..b103bd4 100644 --- a/roles/update_all_packages/tasks/main.yml +++ b/roles/update_all_packages/tasks/main.yml @@ -1,29 +1,21 @@ --- - name: Update package cache for Debian hosts - apt: + ansible.builtin.apt: update_cache: true when: - - ansible_distribution|lower == 'debian' - tags: - - skip_ansible_lint + - "'apt' in ansible_pkg_mgr" - name: Update package cache for RHEL/CentOS/Fedora hosts - dnf: + ansible.builtin.dnf: update_cache: true when: - - (ansible_distribution|lower == 'centos' or - ansible_distribution|lower == 'fedora' or - ansible_distribution|lower == 'redhat') + - "'dnf' in ansible_pkg_mgr" - ansible_distribution_major_version|int >= 8 - tags: - - skip_ansible_lint - name: Update all host packages - package: name=* state=latest - tags: - - skip_ansible_lint + ansible.builtin.package: name=* state=latest ... -- 2.47.1