sandwich/Ansible-Bootstrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(global_defaults): normalize system.type 'vm' to 'virtual' for main project compatibility

Browse Source
This commit is contained in:
Sandwich
2026-02-22 02:21:22 +01:00
parent c91e049378
commit bcfd5d5a89
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/global_defaults/tasks/_normalize_system.yml
View File

@@ -2,7 +2,7 @@
- name: Build normalized system configuration - name: Build normalized system configuration
vars: vars:
system_raw: "{{ system_defaults | combine(system, recursive=True) }}" 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_os_input: "{{ system_raw.os | default('') | string | lower }}"
system_name: >- system_name: >-
{{ {{
@@ -14,7 +14,7 @@
system_cfg: system_cfg:
# --- Identity & platform --- # --- Identity & platform ---
type: "{{ system_type }}" 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 }}" version: "{{ system_raw.version | default('') | string }}"
filesystem: "{{ system_raw.filesystem | default('') | string | lower }}" filesystem: "{{ system_raw.filesystem | default('') | string | lower }}"
name: "{{ system_name }}" name: "{{ system_name }}"
@@ -64,9 +64,9 @@
) )
}} }}
# --- Locale & environment --- # --- Locale & environment ---
timezone: "{{ system_raw.timezone | default('Europe/Vienna') | string }}" timezone: "{{ system_raw.timezone | string }}"
locale: "{{ system_raw.locale | default('en_US.UTF-8') | string }}" locale: "{{ system_raw.locale | string }}"
keymap: "{{ system_raw.keymap | default('us') | string }}" keymap: "{{ system_raw.keymap | string }}"
path: "{{ system_raw.path | default('') | string }}" path: "{{ system_raw.path | default('') | string }}"
packages: >- packages: >-
{{ {{
@@ -129,7 +129,7 @@
chroot: chroot:
tool: "{{ system_raw.features.chroot.tool | string }}" tool: "{{ system_raw.features.chroot.tool | string }}"
hostname: "{{ system_name }}" 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 }}" os_version: "{{ system_raw.version | default('') | string }}"
no_log: true no_log: true