refactor(schema): move filesystem into system dictionary

This commit is contained in:
2026-02-11 05:37:18 +01:00
parent 3d026407e5
commit e7323258fd
8 changed files with 34 additions and 31 deletions

View File

@@ -21,6 +21,7 @@ system_defaults:
type: "virtual" # virtual|physical
os: ""
version: ""
filesystem: ""
name: ""
id: ""
cpus: 0

View File

@@ -16,6 +16,7 @@
system_raw: "{{ system_defaults | combine(system, recursive=True) }}"
system_type: "{{ system_raw.type | string | lower }}"
system_os_input: "{{ system_raw.os | default('') | string | lower }}"
system_filesystem_input: "{{ system_raw.filesystem | default('') | string | lower }}"
system_name: >-
{{
system_raw.name | string | trim
@@ -100,6 +101,7 @@
type: "{{ system_type }}"
os: "{{ system_os_input if system_os_input | length > 0 else ('archlinux' if system_type == 'physical' else '') }}"
version: "{{ system_raw.version | default('') | string }}"
filesystem: "{{ system_filesystem_input }}"
name: "{{ system_name }}"
id: "{{ system_raw.id | default('') | string }}"
cpus: "{{ [system_raw.cpus | default(0) | int, 0] | max }}"

View File

@@ -10,8 +10,8 @@
- hypervisor_cfg is mapping
- hypervisor_type is defined
- hypervisor_type in ["libvirt", "proxmox", "vmware", "xen", "none"]
- filesystem is defined
- filesystem in ["btrfs", "ext4", "xfs"]
- system_cfg.filesystem is defined
- system_cfg.filesystem in ["btrfs", "ext4", "xfs"]
- install_drive is defined
- install_drive | string | length > 0
- hostname is defined
@@ -272,7 +272,7 @@
- (system_cfg.disks[0].size | float) > 0
- (system_cfg.disks[0].size | float) >= 20
- >-
filesystem != "btrfs"
system_cfg.filesystem != "btrfs"
or (
(system_cfg.disks[0].size | float)
>= (