From fc23dc068da875682201f34a1ca89cf98b443940 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Sat, 25 Jun 2022 08:28:44 +0200
Subject: [PATCH] Fix var reference;Install packages;Change DHCP identifier to
 MAC

---
 ansible/roles/appliance/tasks/dependencies.yml | 14 +++++++++++++-
 ansible/vars/metacluster.yml                   |  5 ++++-
 packer/preseed/UbuntuServer22.04/user-data     |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/appliance/tasks/dependencies.yml b/ansible/roles/appliance/tasks/dependencies.yml
index d446f5d..b458cfd 100644
--- a/ansible/roles/appliance/tasks/dependencies.yml
+++ b/ansible/roles/appliance/tasks/dependencies.yml
@@ -8,7 +8,7 @@
 - name: Download & install static binaries
   ansible.builtin.get_url:
     url: "{{ item.url }}"
-    dest: "/usr/local/bin/{{ item.name }}"
+    dest: "/usr/local/bin/{{ item.filename }}"
     owner: root
     group: root
     mode: 0755
@@ -19,6 +19,18 @@
     cmd: "ansible-galaxy collection install {{ item }}"
   loop: "{{ dependencies.ansible_galaxy_collections }}"
 
+- name: Install distro packages
+  ansible.builtin.apt:
+    name: "{{ item }}"
+    update_cache: yes
+    install_recommends: no
+  loop: "{{ dependencies.distro_packages }}"
+
+- name: Update all packages
+  ansible.builtin.apt:
+    name: *
+    state: latest
+
 - block:
 
     - name: Download Helm binary
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index bcf1a0f..bbff903 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -25,5 +25,8 @@ dependencies:
     - kubernetes.core
 
   static_binaries:
-    - binary: yq
+    - filename: yq
       url: http://github.com/mikefarah/yq/releases/download/v4.25.2/yq_linux_amd64
+
+  packages:
+    - skopeo
diff --git a/packer/preseed/UbuntuServer22.04/user-data b/packer/preseed/UbuntuServer22.04/user-data
index a9db06d..0f5af58 100644
--- a/packer/preseed/UbuntuServer22.04/user-data
+++ b/packer/preseed/UbuntuServer22.04/user-data
@@ -11,6 +11,7 @@ autoinstall:
       ethernets:
         ens192:
           dhcp4: true
+          dhcp-identifier: mac
   storage:
     layout:
       name: direct