From 4d045d0c21e6d3600a244324886b96012b99a823 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sun, 17 Dec 2023 01:06:29 -0500 Subject: [PATCH] Ansible-lint compliance for roles/resolv_conf --- roles/resolv_conf/defaults/main.yml | 19 +++++++++---------- roles/resolv_conf/tasks/main.yml | 8 ++++---- roles/resolv_conf/templates/.keep | 0 roles/resolv_conf/templates/resolv_conf.j2 | 12 ++++++------ 4 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 roles/resolv_conf/templates/.keep diff --git a/roles/resolv_conf/defaults/main.yml b/roles/resolv_conf/defaults/main.yml index fd253c3..1312bef 100644 --- a/roles/resolv_conf/defaults/main.yml +++ b/roles/resolv_conf/defaults/main.yml @@ -1,20 +1,19 @@ --- -__project_author : Chris Hammer -__project_email : chris@thezengarden.net -__project_repo : https://github.com/jchristianh-ansible-collections/baseos +resolv_conf_project_author : Chris Hammer +resolv_conf_project_email : chris@thezengarden.net +resolv_conf_project_repo : https://github.com/jchristianh-ansible-collections/baseos -__template_header : The Zen Garden +resolv_conf_template_header : The Zen Garden -__resolv_conf_file : /etc/resolv.conf -__resolv_conf_file_docker : /etc/resolv.conf.docker -__resolv_conf_version : 1.0.1 -__resolv_conf_revision : 221007 +resolv_conf_resolv_conf_file : /etc/resolv.conf +resolv_conf_resolv_conf_version : 1.0.1 +resolv_conf_resolv_conf_revision : 221007 -__search_domain : thezengarden.net -__nameservers : +resolv_conf_search_domain : thezengarden.net +resolv_conf_nameservers : - 10.10.10.55 - 10.1.1.15 diff --git a/roles/resolv_conf/tasks/main.yml b/roles/resolv_conf/tasks/main.yml index 9b2116b..70b2e0f 100644 --- a/roles/resolv_conf/tasks/main.yml +++ b/roles/resolv_conf/tasks/main.yml @@ -1,15 +1,15 @@ --- -- name: Set resolv_conf_file if running in Docker +- name: Set resolv_conf_file if running in container ansible.builtin.set_fact: - __resolv_conf_file: "{{ __resolv_conf_file_docker }}" + __resolv_conf_file: "{{ resolv_conf_resolv_conf_file }}.docker" when: - ansible_virtualization_type | regex_search("docker|podman|container") -- name: Deploy {{ __resolv_conf_file }} +- name: Deploy {{ resolv_conf_resolv_conf_file }} ansible.builtin.template: src: templates/resolv_conf.j2 - dest: "{{ __resolv_conf_file }}" + dest: "{{ resolv_conf_resolv_conf_file }}" mode: "0644" diff --git a/roles/resolv_conf/templates/.keep b/roles/resolv_conf/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/resolv_conf/templates/resolv_conf.j2 b/roles/resolv_conf/templates/resolv_conf.j2 index e078f86..f90c211 100644 --- a/roles/resolv_conf/templates/resolv_conf.j2 +++ b/roles/resolv_conf/templates/resolv_conf.j2 @@ -1,15 +1,15 @@ -# {{ __template_header }} +# {{ resolv_conf_template_header }} ############################################### # -# Configuration : {{ __resolv_conf_file }} -# Template Version : {{ __resolv_conf_version}}-{{ __resolv_conf_revision }} +# Configuration : {{ resolv_conf_resolv_conf_file }} +# Template Version : {{ __resolv_confresolv_conf_resolv_conf_version_version}}-{{ resolv_conf_resolv_conf_revision }} # -# {{ __project_author }} ({{ __project_email }}) +# {{ resolv_conf_project_author }} ({{ resolv_conf_project_email }}) ############################################### -search {{ __search_domain }} -{% for item in __nameservers %} +search {{ resolv_conf_search_domain }} +{% for item in resolv_conf_nameservers %} nameserver {{ item }} {% endfor %}