From 818187a484f405deb85d01c59268346b82acc59c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 16 Dec 2023 03:11:35 -0500 Subject: [PATCH] Ansible-lint compliance for roles/base_packages and slight restructuring --- roles/base_packages/defaults/main.yml | 10 ---------- roles/base_packages/tasks/main.yml | 12 ++++++------ roles/base_packages/vars/centos_7.yml | 2 +- roles/base_packages/vars/centos_8.yml | 2 +- roles/base_packages/vars/centos_9.yml | 2 +- roles/base_packages/vars/debian_11.yml | 2 +- .../{__default_packages.yml => default_packages.yml} | 2 +- roles/base_packages/vars/main.yml | 2 -- 8 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 roles/base_packages/defaults/main.yml rename roles/base_packages/vars/{__default_packages.yml => default_packages.yml} (94%) delete mode 100644 roles/base_packages/vars/main.yml diff --git a/roles/base_packages/defaults/main.yml b/roles/base_packages/defaults/main.yml deleted file mode 100644 index 26bcea3..0000000 --- a/roles/base_packages/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -__project_author : Chris Hammer -__project_email : chris@thezengarden.net -__project_repo : https://github.com/jchristianh-ansible-collections/baseos - - -__template_header : The Zen Garden - - -... diff --git a/roles/base_packages/tasks/main.yml b/roles/base_packages/tasks/main.yml index 3a7b7b8..3982b5c 100644 --- a/roles/base_packages/tasks/main.yml +++ b/roles/base_packages/tasks/main.yml @@ -2,18 +2,18 @@ - name: Include distribution specific variables or include defaults block: - name: Include distribution specific variables - include_vars: + ansible.builtin.include_vars: file: "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml" rescue: - name: Non-supported distribution; using default package set - include_vars: - file: __default_packages.yml + ansible.builtin.include_vars: + file: default_packages.yml - name: Install EPEL for CentOS hosts - Required for some packages - package: + ansible.builtin.package: name : epel-release state : present when: @@ -21,8 +21,8 @@ - name: Install package set - package: - name : "{{ __base_packages }}" + ansible.builtin.package: + name : "{{ base_packages_package_set }}" state : present diff --git a/roles/base_packages/vars/centos_7.yml b/roles/base_packages/vars/centos_7.yml index 4436738..80f78e2 100644 --- a/roles/base_packages/vars/centos_7.yml +++ b/roles/base_packages/vars/centos_7.yml @@ -1,5 +1,5 @@ --- -__base_packages: +base_packages_package_set: - bc - bind-utils - bzip2 diff --git a/roles/base_packages/vars/centos_8.yml b/roles/base_packages/vars/centos_8.yml index 35952ca..f353814 100644 --- a/roles/base_packages/vars/centos_8.yml +++ b/roles/base_packages/vars/centos_8.yml @@ -1,5 +1,5 @@ --- -__base_packages: +base_packages_package_set: - bc - bind-utils - bzip2 diff --git a/roles/base_packages/vars/centos_9.yml b/roles/base_packages/vars/centos_9.yml index 9057f92..09d2e86 100644 --- a/roles/base_packages/vars/centos_9.yml +++ b/roles/base_packages/vars/centos_9.yml @@ -1,5 +1,5 @@ --- -__base_packages: +base_packages_package_set: - bc - bind-utils - bzip2 diff --git a/roles/base_packages/vars/debian_11.yml b/roles/base_packages/vars/debian_11.yml index f69e143..44b0c15 100644 --- a/roles/base_packages/vars/debian_11.yml +++ b/roles/base_packages/vars/debian_11.yml @@ -1,5 +1,5 @@ --- -__base_packages: +base_packages_package_set: - bc - bind9utils - bzip2 diff --git a/roles/base_packages/vars/__default_packages.yml b/roles/base_packages/vars/default_packages.yml similarity index 94% rename from roles/base_packages/vars/__default_packages.yml rename to roles/base_packages/vars/default_packages.yml index 2572d40..498e4af 100644 --- a/roles/base_packages/vars/__default_packages.yml +++ b/roles/base_packages/vars/default_packages.yml @@ -5,7 +5,7 @@ # Please adjust accordingly, or include a vars file matching the pattern: # _.yml -__base_packages: +base_packages_package_set: - bc - bzip2 - file diff --git a/roles/base_packages/vars/main.yml b/roles/base_packages/vars/main.yml deleted file mode 100644 index d02746f..0000000 --- a/roles/base_packages/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for base_packages