diff --git a/main.yml b/main.yml index 72ab2aa..be73f70 100644 --- a/main.yml +++ b/main.yml @@ -26,6 +26,10 @@ confirm: true vars_files: vars.yml pre_tasks: + - name: Load global defaults + ansible.builtin.import_role: + name: global_defaults + - name: Validate variables ansible.builtin.assert: that: diff --git a/group_vars/all.yml b/roles/global_defaults/defaults/main.yml similarity index 51% rename from group_vars/all.yml rename to roles/global_defaults/defaults/main.yml index 20cd697..246b945 100644 --- a/group_vars/all.yml +++ b/roles/global_defaults/defaults/main.yml @@ -55,23 +55,3 @@ luks_key_size: 512 luks_pbkdf: "argon2id" luks_use_urandom: 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 diff --git a/roles/global_defaults/tasks/main.yml b/roles/global_defaults/tasks/main.yml new file mode 100644 index 0000000..1072032 --- /dev/null +++ b/roles/global_defaults/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: Load global defaults + ansible.builtin.debug: + msg: "Global defaults loaded." + verbosity: 1 + changed_when: false diff --git a/roles/partitioning/defaults/main.yml b/roles/partitioning/defaults/main.yml index c3da7f1..e41b620 100644 --- a/roles/partitioning/defaults/main.yml +++ b/roles/partitioning/defaults/main.yml @@ -1,5 +1,6 @@ --- partitioning_luks_enabled: "{{ luks_enabled | bool }}" +partitioning_luks_passphrase: "{{ luks_passphrase }}" partitioning_luks_mapper_name: "{{ luks_mapper_name }}" partitioning_luks_type: "{{ luks_type }}" 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_keyfile_size: "{{ luks_keyfile_size }}" partitioning_luks_options: "{{ luks_options }}" +partitioning_vm_size: 0 +partitioning_vm_memory: 0 partitioning_boot_partition_suffix: 1 partitioning_main_partition_suffix: 2 partitioning_efi_size_mib: 50