From d33036dcf6b22fd6c491a81298931683ae66960e Mon Sep 17 00:00:00 2001
From: Tobias Stein <tobias_stein@rockstable.it>
Date: Wed, 7 Dec 2022 23:46:27 +0100
Subject: [PATCH] Sastify ansible-lint

---
 roles/fai/tasks/fai-nfsroot.yml |  2 ++
 roles/fai/tasks/main.yml        |  7 ++-----
 roles/fai/tasks/unbound.yml     | 19 +++++--------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/roles/fai/tasks/fai-nfsroot.yml b/roles/fai/tasks/fai-nfsroot.yml
index 70373f6..69362e5 100644
--- a/roles/fai/tasks/fai-nfsroot.yml
+++ b/roles/fai/tasks/fai-nfsroot.yml
@@ -36,6 +36,8 @@
   loop:
     - "FOCAL64"
     - "JAMMY64"
+  tags:
+    - unbound_configure
 
 - name: "Allow '{{ fai_loguser }}' to write to '{{ tftp_dir }}' to ship logs"
   become: true
diff --git a/roles/fai/tasks/main.yml b/roles/fai/tasks/main.yml
index 64d122c..0f8db12 100644
--- a/roles/fai/tasks/main.yml
+++ b/roles/fai/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for fai
 - name: "Fail if 'dhcp_interface' is undefined"
-  fail:
+  ansible.builtin.fail:
     msg: |
       Please specify the NIC serving FAI
       in variable 'dhcp_interface' (e.g. eth1)
@@ -13,7 +13,7 @@
     manager: auto
 
 - name: "Debug host_vars"
-  debug:
+  ansible.builtin.debug:
     var: hostvars
     verbosity: 1
   tags:
@@ -108,9 +108,6 @@
       tags:
         - fai_profiles
 
-  tags:
-    - fai_profiles
-
 - name: "Create FAI nfsroot"
   include_tasks:
     file: fai-nfsroot.yml
diff --git a/roles/fai/tasks/unbound.yml b/roles/fai/tasks/unbound.yml
index 14fb3c7..1cd6563 100644
--- a/roles/fai/tasks/unbound.yml
+++ b/roles/fai/tasks/unbound.yml
@@ -1,12 +1,12 @@
 - name: "Ensure systemd-resolved is stopped and disabled"
-  service:
+  ansible.buildin.service:
     name: systemd-resolved
     enabled: false
     state: stopped
-  tags:
-    - systemd-resolved_disable
   when:
     - "'systemd-resolved' in ansible_facts.packages"
+  tags:
+    - systemd-resolved_disable
 
 - name: "Install DNS - unbound server"
   become: true
@@ -26,10 +26,10 @@
     group: root
     validate: "unbound-checkconf %s"
   notify: restart unbound
-  tags:
-    - unbound_configure
   when:
     - false
+  tags:
+    - unbound_configure
 
 - name: "Configure DNS - zone '{{ domain_name }}'"
   become: true
@@ -69,12 +69,3 @@
   tags:
     - unbound_enable
 
-- name: >
-    "Sleep for '{{wait_timeout_unbound }}' seconds
-    then run handlers to restart unbound"
-  vars:
-    wait_timeout_unbound: 3
-  wait_for:
-    timeout: "{{ wait_timeout_unbound }}"
-  delegate_to: localhost
-  when: false