Move global defaults into role defaults

This commit is contained in:
2025-12-28 16:47:53 +01:00
parent 7fe2a0dcc1
commit fd37b4ee96
4 changed files with 13 additions and 20 deletions

View File

@@ -26,6 +26,10 @@
confirm: true confirm: true
vars_files: vars.yml vars_files: vars.yml
pre_tasks: pre_tasks:
- name: Load global defaults
ansible.builtin.import_role:
name: global_defaults
- name: Validate variables - name: Validate variables
ansible.builtin.assert: ansible.builtin.assert:
that: that:

View File

@@ -55,23 +55,3 @@ luks_key_size: 512
luks_pbkdf: "argon2id" luks_pbkdf: "argon2id"
luks_use_urandom: true luks_use_urandom: true
luks_verify_passphrase: true luks_verify_passphrase: true
partitioning_luks_enabled: "{{ luks_enabled }}"
partitioning_luks_passphrase: "{{ luks_passphrase }}"
partitioning_luks_mapper_name: "{{ luks_mapper_name }}"
partitioning_luks_type: "{{ luks_type }}"
partitioning_luks_cipher: "{{ luks_cipher }}"
partitioning_luks_hash: "{{ luks_hash }}"
partitioning_luks_iter_time: "{{ luks_iter_time }}"
partitioning_luks_key_size: "{{ luks_key_size }}"
partitioning_luks_pbkdf: "{{ luks_pbkdf }}"
partitioning_luks_use_urandom: "{{ luks_use_urandom }}"
partitioning_luks_verify_passphrase: "{{ luks_verify_passphrase }}"
partitioning_luks_auto_decrypt: "{{ luks_auto_decrypt }}"
partitioning_luks_auto_decrypt_method: "{{ luks_auto_decrypt_method }}"
partitioning_luks_tpm2_device: "{{ luks_tpm2_device }}"
partitioning_luks_tpm2_pcrs: "{{ luks_tpm2_pcrs }}"
partitioning_luks_keyfile_size: "{{ luks_keyfile_size }}"
partitioning_luks_options: "{{ luks_options }}"
partitioning_vm_size: 0
partitioning_vm_memory: 0

View File

@@ -0,0 +1,6 @@
---
- name: Load global defaults
ansible.builtin.debug:
msg: "Global defaults loaded."
verbosity: 1
changed_when: false

View File

@@ -1,5 +1,6 @@
--- ---
partitioning_luks_enabled: "{{ luks_enabled | bool }}" partitioning_luks_enabled: "{{ luks_enabled | bool }}"
partitioning_luks_passphrase: "{{ luks_passphrase }}"
partitioning_luks_mapper_name: "{{ luks_mapper_name }}" partitioning_luks_mapper_name: "{{ luks_mapper_name }}"
partitioning_luks_type: "{{ luks_type }}" partitioning_luks_type: "{{ luks_type }}"
partitioning_luks_cipher: "{{ luks_cipher }}" partitioning_luks_cipher: "{{ luks_cipher }}"
@@ -15,6 +16,8 @@ partitioning_luks_tpm2_device: "{{ luks_tpm2_device }}"
partitioning_luks_tpm2_pcrs: "{{ luks_tpm2_pcrs }}" partitioning_luks_tpm2_pcrs: "{{ luks_tpm2_pcrs }}"
partitioning_luks_keyfile_size: "{{ luks_keyfile_size }}" partitioning_luks_keyfile_size: "{{ luks_keyfile_size }}"
partitioning_luks_options: "{{ luks_options }}" partitioning_luks_options: "{{ luks_options }}"
partitioning_vm_size: 0
partitioning_vm_memory: 0
partitioning_boot_partition_suffix: 1 partitioning_boot_partition_suffix: 1
partitioning_main_partition_suffix: 2 partitioning_main_partition_suffix: 2
partitioning_efi_size_mib: 50 partitioning_efi_size_mib: 50