From f9a2a0cda39b5ca80c5514a8ecb1f22b26db086f Mon Sep 17 00:00:00 2001
From: Antony Messerli <antony@mes.ser.li>
Date: Mon, 18 Nov 2019 05:34:35 +0000
Subject: [PATCH] Fixing some ansible-lint issues

---
 roles/netbootxyz/meta/main.yml                 |  2 +-
 roles/netbootxyz/tasks/generate_disks_base.yml |  4 ++--
 roles/netbootxyz/tasks/generate_disks_efi.yml  |  4 ++++
 .../netbootxyz/tasks/generate_disks_legacy.yml |  2 ++
 roles/netbootxyz/tasks/generate_menus.yml      | 18 ++++++++----------
 user_overrides.yml                             |  5 +++--
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/roles/netbootxyz/meta/main.yml b/roles/netbootxyz/meta/main.yml
index 37bf4bc3..4524dfdc 100644
--- a/roles/netbootxyz/meta/main.yml
+++ b/roles/netbootxyz/meta/main.yml
@@ -10,6 +10,6 @@ galaxy_info:
     - name: Centos
       versions:
         - all
-  galaxy_tags: 
+  galaxy_tags:
     - system
 dependencies: []
diff --git a/roles/netbootxyz/tasks/generate_disks_base.yml b/roles/netbootxyz/tasks/generate_disks_base.yml
index 3d2bfc4b..7c39d141 100644
--- a/roles/netbootxyz/tasks/generate_disks_base.yml
+++ b/roles/netbootxyz/tasks/generate_disks_base.yml
@@ -30,7 +30,7 @@
   - name: Install required packages
     package:
       name: "{{ item }}"
-      state: latest
+      state: present
     with_items: "{{ netbootxyz_packages }}"
 
   - name: Check out latest iPXE sources
@@ -63,4 +63,4 @@
       - src/config/local/entropy.h
       - src/config/local/crypto.h
       - src/config/local/usb.h
-      - src/config/local/settings.h
\ No newline at end of file
+      - src/config/local/settings.h
diff --git a/roles/netbootxyz/tasks/generate_disks_efi.yml b/roles/netbootxyz/tasks/generate_disks_efi.yml
index ea6cdb7b..67b78f5b 100644
--- a/roles/netbootxyz/tasks/generate_disks_efi.yml
+++ b/roles/netbootxyz/tasks/generate_disks_efi.yml
@@ -20,6 +20,8 @@
     - make EMBED=ipxe-bootloader bin-x86_64-efi/ipxe.efi
     args:
       chdir: "{{ ipxe_source_dir }}/src"
+    tags:
+    - skip_ansible_lint
 
   - name: Generate iPXE EFI ISO Disk
     shell: "{{ item }}"
@@ -33,6 +35,8 @@
     args:
       chdir: "{{ ipxe_source_dir }}/src"
       warn: false
+    tags:
+    - skip_ansible_lint
 
   - name: Copy iPXE EFI builds to http directory
     copy:
diff --git a/roles/netbootxyz/tasks/generate_disks_legacy.yml b/roles/netbootxyz/tasks/generate_disks_legacy.yml
index 70bcced4..90312fb4 100644
--- a/roles/netbootxyz/tasks/generate_disks_legacy.yml
+++ b/roles/netbootxyz/tasks/generate_disks_legacy.yml
@@ -16,6 +16,8 @@
     - make EMBED=ipxe-bootloader bin/ipxe.dsk bin/ipxe.iso bin/ipxe.lkrn bin/ipxe.usb bin/ipxe.kpxe bin/undionly.kpxe
     args:
       chdir: "{{ ipxe_source_dir }}/src"
+    tags:
+    - skip_ansible_lint
 
   - name: Copy iPXE files for Legacy BIOS to http directory
     copy:
diff --git a/roles/netbootxyz/tasks/generate_menus.yml b/roles/netbootxyz/tasks/generate_menus.yml
index f9109fb5..ce27f2fc 100644
--- a/roles/netbootxyz/tasks/generate_menus.yml
+++ b/roles/netbootxyz/tasks/generate_menus.yml
@@ -1,36 +1,34 @@
 ---
   - name: Combine overrides with release defaults
-    set_fact: 
+    set_fact:
       _releases: "{{ releases|combine(release_overrides, recursive=True) }}"
+    when: release_overrides is defined
 
   - name: Set releases with user overrides
     set_fact:
       releases: "{{ _releases }}"
+    when: release_overrides is defined
 
   - name: Combine overrides with utilities defaults
-    set_fact: 
+    set_fact:
       _utilities: "{{ utilities|combine(utilities_overrides, recursive=True) }}"
+    when: utilities_overrides is defined
 
   - name: Set utility with user overrides
     set_fact:
       utilities: "{{ _utilities }}"
+    when: utilities_overrides is defined
 
   - name: Generate directories
     file:
       path: "{{ netbootxyz_root }}"
       state: directory
 
-  - name: Dump releases vars for debugging
-    debug:
-      var: releases
-
-  - name: Dump endpoint vars for debugging
-    debug:
-      var: endpoints
-
   - name: Generate netboot.xyz source files templates
     template:
       src: "{{ item.src }}"
       dest: "{{ netbootxyz_root }}/{{ item.path | regex_replace('.j2','') }}"
     with_filetree: "templates/menu/"
     when: item.state == "file"
+    tags:
+    - skip_ansible_lint
diff --git a/user_overrides.yml b/user_overrides.yml
index 86f4497b..105f4833 100644
--- a/user_overrides.yml
+++ b/user_overrides.yml
@@ -20,10 +20,11 @@ generate_disks: true
 # set release overrides from standard netboot.xyz defaults
 #release_overrides:
 #  alpinelinux:
-#    name: "ALPINELINUX"
+#    name: "Alpine Linux"
 #  fedora:
 #    mirror: "mirrors.kernel.org"
 
 # set utilities_overrides from standard netboot.xyz defaults
 #utilities_overrides:
-  
\ No newline at end of file
+#  supergrub:
+#    enabled: false