From 9501386adb92e4920e4cab065df5083b338b61c3 Mon Sep 17 00:00:00 2001 From: Raoul Date: Thu, 2 Sep 2021 05:26:00 +0200 Subject: [PATCH] Scope variables --- defaults/main.yml | 6 +++--- tasks/install.yml | 4 ++-- tasks/nsswitch.yml | 2 +- templates/nsswitch.conf.j2 | 2 +- vars/Archlinux.yml | 2 +- vars/Debian.yml | 2 +- vars/os_fallback.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 630d7a2..ebedf51 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,10 +1,10 @@ --- # deploy custom /etc/nsswitch.conf config -avahi__configure_nsswitch: true +avahi_client__configure_nsswitch: true # mdns resolver name -avahi__mdns_name: 'mdns' -avahi__mdns_minimal_name: 'mdns_minimal' +avahi_client__mdns_name: 'mdns' +avahi_client__mdns_minimal_name: 'mdns_minimal' # should we do a version check? (recomended) submodules_versioncheck: false diff --git a/tasks/install.yml b/tasks/install.yml index 189369a..6898f1a 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -7,8 +7,8 @@ when: - ansible_pkg_mgr == "apt" -- name: install avahi packages +- name: Install Avahi packages become: true ansible.builtin.package: - name: "{{ avahi_packages }}" + name: "{{ avahi_client__packages }}" state: present diff --git a/tasks/nsswitch.yml b/tasks/nsswitch.yml index 5981771..5ca6336 100644 --- a/tasks/nsswitch.yml +++ b/tasks/nsswitch.yml @@ -1,5 +1,5 @@ --- -- name: deploy /etc/nsswitch.conf +- name: Deploy '/etc/nsswitch.conf' become: true ansible.builtin.template: src: 'templates/nsswitch.conf.j2' diff --git a/templates/nsswitch.conf.j2 b/templates/nsswitch.conf.j2 index f1bfdbd..e0edcbc 100644 --- a/templates/nsswitch.conf.j2 +++ b/templates/nsswitch.conf.j2 @@ -12,7 +12,7 @@ gshadow: files publickey: files -hosts: files mymachines myhostname {{ avahi__mdns_minimal_name }} [NOTFOUND=return] resolve [!UNAVAIL=return] dns {{ avahi__mdns_name }} +hosts: files mymachines myhostname {{ avahi_client__mdns_minimal_name }} [NOTFOUND=return] resolve [!UNAVAIL=return] dns {{ avahi_client__mdns_name }} networks: files protocols: db [NOTFOUND=return] files diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index a884c8e..44823a4 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -1,5 +1,5 @@ --- -avahi_packages: - avahi - mdns-scan - nss-mdns +avahi_client__packages: diff --git a/vars/Debian.yml b/vars/Debian.yml index 791e317..74e50fa 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,5 +1,5 @@ --- -avahi_packages: +avahi_client__packages: - 'avahi-discover' - 'avahi-utils' - 'mdns-scan' diff --git a/vars/os_fallback.yml b/vars/os_fallback.yml index 4b6d3e0..22c59c9 100644 --- a/vars/os_fallback.yml +++ b/vars/os_fallback.yml @@ -1,3 +1,3 @@ --- -avahi_packages: - mdns-scan +avahi_client__packages: