From aceaf94c9b4c5a2a1b7a9b92d591887523864d21 Mon Sep 17 00:00:00 2001
From: Tobias Stein <tobias_stein@rockstable.it>
Date: Fri, 9 Dec 2022 05:25:41 +0100
Subject: [PATCH] Refactor configuration of the host package management

---
 roles/fai/tasks/package_mgmt.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/roles/fai/tasks/package_mgmt.yml b/roles/fai/tasks/package_mgmt.yml
index dc05875..5f50737 100644
--- a/roles/fai/tasks/package_mgmt.yml
+++ b/roles/fai/tasks/package_mgmt.yml
@@ -1,3 +1,4 @@
+---
 - name: "Install gpg"
   become: true
   ansible.builtin.package:
@@ -15,17 +16,26 @@
   tags:
     - fai_repo_key_install
 
-- name: "Add repositories"
+- name: "Add repositories to apt for the server"
   become: true
   ansible.builtin.apt_repository:
     repo: "{{ item.repo }}"
     filename: "{{ item.filename | default(omit) }}"
     state: present
+    update_cache: false
+  loop: "{{ repos }}"
   tags:
     - fai_repo
-  loop: "{{ repos }}"
 
-- name: "Remove sources.list"
+- name: "Update apt cache"
+  become: true
+  ansible.builtin.apt:
+    update_cache: true
+  tags:
+    - fai_repo
+    - fai_repo_update
+
+- name: "Remove 'sources.list' from server"
   become: true
   vars:
     paths:
@@ -36,13 +46,16 @@
     state: absent
   loop: "{{ paths }}"
 
-- name: "Add preferences"
+- name: "Set apt preferences for the server in '{{ dest }}'"
   become: true
+  vars:
+    dest: "/etc/apt/preferences.d/zz_releases"
   ansible.builtin.template:
     src: "etc/apt/preferences.d/pinning.j2"
-    dest: "/etc/apt/preferences.d/zz_releases"
+    dest: "{{ dest }}"
     owner: root
     group: root
     mode: "0644"
   tags:
-    - fai_repo
+    - fai_repo_apt_preferences
+