diff --git a/roles/global_defaults/tasks/_normalize_system.yml b/roles/global_defaults/tasks/_normalize_system.yml index e5dcd4c..a3a4ac6 100644 --- a/roles/global_defaults/tasks/_normalize_system.yml +++ b/roles/global_defaults/tasks/_normalize_system.yml @@ -2,7 +2,7 @@ - name: Build normalized system configuration vars: system_raw: "{{ system_defaults | combine(system, recursive=True) }}" - system_type: "{{ system_raw.type | string | lower }}" + system_type: "{{ 'virtual' if (system_raw.type | string | lower) in ['vm', 'virtual'] else (system_raw.type | string | lower) }}" system_os_input: "{{ system_raw.os | default('') | string | lower }}" system_name: >- {{ @@ -14,7 +14,7 @@ system_cfg: # --- Identity & platform --- type: "{{ system_type }}" - os: "{{ system_os_input if system_os_input | length > 0 else ('archlinux' if system_type == 'physical' else '') }}" + os: "{{ system_os_input if system_os_input | length > 0 else (physical_default_os if system_type == 'physical' else '') }}" version: "{{ system_raw.version | default('') | string }}" filesystem: "{{ system_raw.filesystem | default('') | string | lower }}" name: "{{ system_name }}" @@ -64,9 +64,9 @@ ) }} # --- Locale & environment --- - timezone: "{{ system_raw.timezone | default('Europe/Vienna') | string }}" - locale: "{{ system_raw.locale | default('en_US.UTF-8') | string }}" - keymap: "{{ system_raw.keymap | default('us') | string }}" + timezone: "{{ system_raw.timezone | string }}" + locale: "{{ system_raw.locale | string }}" + keymap: "{{ system_raw.keymap | string }}" path: "{{ system_raw.path | default('') | string }}" packages: >- {{ @@ -129,7 +129,7 @@ chroot: tool: "{{ system_raw.features.chroot.tool | string }}" hostname: "{{ system_name }}" - os: "{{ system_os_input if system_os_input | length > 0 else ('archlinux' if system_type == 'physical' else '') }}" + os: "{{ system_os_input if system_os_input | length > 0 else (physical_default_os if system_type == 'physical' else '') }}" os_version: "{{ system_raw.version | default('') | string }}" no_log: true