From 75395cc8d2866eb23a3c5b4e59c76281d4f1a6c9 Mon Sep 17 00:00:00 2001 From: Sandwich Date: Fri, 2 Jan 2026 13:52:37 +0100 Subject: [PATCH] Drop custom_iso_enabled and log defaults --- roles/environment/tasks/main.yml | 8 ++++---- roles/global_defaults/defaults/main.yml | 1 - roles/global_defaults/tasks/main.yml | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/roles/environment/tasks/main.yml b/roles/environment/tasks/main.yml index 4237c70..8580267 100644 --- a/roles/environment/tasks/main.yml +++ b/roles/environment/tasks/main.yml @@ -17,7 +17,7 @@ - name: Abort if the host is not booted from the Arch install media when: - - not custom_iso_enabled + - not (custom_iso | bool) - not environment_archiso_stat.stat.exists ansible.builtin.fail: msg: This host is not booted from the Arch install media! @@ -88,14 +88,14 @@ - name: Prepare installer environment block: - name: Speed-up Bootstrap process - when: not custom_iso_enabled + when: not (custom_iso | bool) ansible.builtin.lineinfile: path: /etc/pacman.conf regexp: ^#ParallelDownloads = line: ParallelDownloads = 20 - name: Wait for pacman lock to be released - when: not custom_iso_enabled + when: not (custom_iso | bool) ansible.builtin.wait_for: path: /var/lib/pacman/db.lck state: absent @@ -104,7 +104,7 @@ - name: Setup Pacman when: - - not custom_iso_enabled + - not (custom_iso | bool) - "'os' not in item or os in item.os" community.general.pacman: update_cache: true diff --git a/roles/global_defaults/defaults/main.yml b/roles/global_defaults/defaults/main.yml index 492335c..7d641bd 100644 --- a/roles/global_defaults/defaults/main.yml +++ b/roles/global_defaults/defaults/main.yml @@ -7,7 +7,6 @@ vmware_ssh: false firewalld_enabled: true cis_enabled: "{{ cis | bool }}" -custom_iso_enabled: "{{ custom_iso | bool }}" luks_enabled: false luks_mapper_name: "SYSTEM_DECRYPTED" diff --git a/roles/global_defaults/tasks/main.yml b/roles/global_defaults/tasks/main.yml index ed97d53..6f5ce42 100644 --- a/roles/global_defaults/tasks/main.yml +++ b/roles/global_defaults/tasks/main.yml @@ -1 +1,5 @@ --- +- name: Global defaults loaded + ansible.builtin.debug: + msg: Global defaults loaded. + changed_when: false