From 22e66959eebc5bc40c6b7d1d28f8fa56bc77fab0 Mon Sep 17 00:00:00 2001 From: Sandwich Date: Mon, 24 Aug 2026 18:38:48 +0200 Subject: [PATCH] fix(global_defaults): normalize disks when install_drive is supplied externally --- roles/global_defaults/tasks/_normalize_disks.yml | 1 + roles/global_defaults/tasks/system.yml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/global_defaults/tasks/_normalize_disks.yml b/roles/global_defaults/tasks/_normalize_disks.yml index 6610d74..daf395f 100644 --- a/roles/global_defaults/tasks/_normalize_disks.yml +++ b/roles/global_defaults/tasks/_normalize_disks.yml @@ -94,6 +94,7 @@ - name: Set install_drive from primary disk when: + - install_drive is not defined - system_disks_cfg | length > 0 - system_disks_cfg[0].device | string | length > 0 ansible.builtin.set_fact: diff --git a/roles/global_defaults/tasks/system.yml b/roles/global_defaults/tasks/system.yml index 11c1a6b..eb72b4f 100644 --- a/roles/global_defaults/tasks/system.yml +++ b/roles/global_defaults/tasks/system.yml @@ -79,9 +79,7 @@ os_version: "{{ system_cfg.version | default('') | string }}" - name: Normalize disk configuration (pre-computed system_cfg) - when: - - system_cfg is defined - - install_drive is not defined + when: system_cfg is defined ansible.builtin.include_tasks: _normalize_disks.yml # Runs on every path before validation, so an empty firewall.backend / content.source