refactor(schema): move filesystem into system dictionary

roles/partitioning/defaults/main.yml

@@ -31,8 +31,8 @@ partitioning_separate_boot: >-
   }}
 partitioning_boot_fs_fstype: >-
   {{
-    (filesystem | lower)
-    if (filesystem | lower) != 'btrfs'
+    (system_cfg.filesystem | lower)
+    if (system_cfg.filesystem | lower) != 'btrfs'
     else ('xfs' if is_rhel else 'ext4')
   }}
 partitioning_boot_fs_partition_suffix: >-

roles/partitioning/tasks/main.yml

@@ -246,7 +246,7 @@
         partitioning_luks_uuid: "{{ partitioning_luks_uuid_result.stdout | trim }}"
 
 - name: Create LVM logical volumes
-  when: filesystem != 'btrfs'
+  when: system_cfg.filesystem != 'btrfs'
   block:
     - name: Create LVM volume group
       community.general.lvg:
@@ -432,14 +432,14 @@
 
     - name: Create swap filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.swap.enabled | bool
       community.general.filesystem:
         fstype: swap
         dev: /dev/sys/swap
 
     - name: Create filesystem
-      ansible.builtin.include_tasks: "{{ filesystem }}.yml"
+      ansible.builtin.include_tasks: "{{ system_cfg.filesystem }}.yml"
 
     - name: Get UUID for boot filesystem
       ansible.builtin.command: blkid -s UUID -o value '{{ install_drive }}{{ partitioning_boot_partition_suffix }}'
@@ -459,14 +459,14 @@
       changed_when: false
 
     - name: Get UUID for LVM root filesystem
-      when: filesystem != 'btrfs'
+      when: system_cfg.filesystem != 'btrfs'
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/root
       register: partitioning_uuid_root_result
       changed_when: false
 
     - name: Get UUID for LVM swap filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.swap.enabled | bool
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/swap
       register: partitioning_uuid_swap_result
@@ -474,7 +474,7 @@
 
     - name: Get UUID for LVM home filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.cis.enabled
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/home
       register: partitioning_uuid_home_result
@@ -482,7 +482,7 @@
 
     - name: Get UUID for LVM var filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.cis.enabled
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/var
       register: partitioning_uuid_var_result
@@ -490,7 +490,7 @@
 
     - name: Get UUID for LVM var_log filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.cis.enabled
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/var_log
       register: partitioning_uuid_var_log_result
@@ -498,14 +498,14 @@
 
     - name: Get UUID for LVM var_log_audit filesystem
       when:
-        - filesystem != 'btrfs'
+        - system_cfg.filesystem != 'btrfs'
         - system_cfg.features.cis.enabled
       ansible.builtin.command: blkid -s UUID -o value /dev/sys/var_log_audit
       register: partitioning_uuid_var_log_audit_result
       changed_when: false
 
     - name: Assign UUIDs to Variables
-      when: filesystem != 'btrfs'
+      when: system_cfg.filesystem != 'btrfs'
       ansible.builtin.set_fact:
         partitioning_uuid_root: "{{ partitioning_uuid_root_result.stdout_lines | default([]) }}"
         partitioning_uuid_swap: >-
@@ -546,17 +546,17 @@
         - >-
           system_cfg.features.cis.enabled or (
             not system_cfg.features.cis.enabled and (
-              (filesystem == 'btrfs' and item.path in ['/home', '/var/log', '/var/cache/pacman/pkg'])
+              (system_cfg.filesystem == 'btrfs' and item.path in ['/home', '/var/log', '/var/cache/pacman/pkg'])
               or (item.path not in ['/home', '/var', '/var/log', '/var/log/audit', '/var/cache/pacman/pkg'])
             )
           )
         - >-
-          not (item.path in ['/swap', '/var/cache/pacman/pkg'] and filesystem != 'btrfs')
+          not (item.path in ['/swap', '/var/cache/pacman/pkg'] and system_cfg.filesystem != 'btrfs')
         - system_cfg.features.swap.enabled | bool or item.path != '/swap'
       ansible.posix.mount:
         path: /mnt{{ item.path }}
-        src: "{{ 'UUID=' + (partitioning_main_uuid.stdout if filesystem == 'btrfs' else item.uuid) }}"
-        fstype: "{{ filesystem }}"
+        src: "{{ 'UUID=' + (partitioning_main_uuid.stdout if system_cfg.filesystem == 'btrfs' else item.uuid) }}"
+        fstype: "{{ system_cfg.filesystem }}"
         opts: "{{ item.opts }}"
         state: mounted
       loop:
@@ -565,7 +565,7 @@
           opts: >-
             {{
               'defaults'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'relatime', partitioning_btrfs_compress_opt, 'ssd', 'space_cache=v2',
                 'discard=async', 'subvol=@'
@@ -584,7 +584,7 @@
           opts: >-
             {{
               'defaults,nosuid,nodev'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'nosuid', 'nodev', 'relatime', partitioning_btrfs_compress_opt, 'ssd',
                 'space_cache=v2', 'discard=async', 'subvol=@home'
@@ -595,7 +595,7 @@
           opts: >-
             {{
               'defaults,nosuid,nodev'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'nosuid', 'nodev', 'relatime', partitioning_btrfs_compress_opt, 'ssd',
                 'space_cache=v2', 'discard=async', 'subvol=@var'
@@ -606,7 +606,7 @@
           opts: >-
             {{
               'defaults,nosuid,nodev,noexec'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'nosuid', 'nodev', 'noexec', 'relatime', partitioning_btrfs_compress_opt,
                 'ssd', 'space_cache=v2', 'discard=async', 'subvol=@var_log'
@@ -617,7 +617,7 @@
           opts: >-
             {{
               'defaults,nosuid,nodev,noexec'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'nosuid', 'nodev', 'noexec', 'relatime', partitioning_btrfs_compress_opt,
                 'ssd', 'space_cache=v2', 'discard=async', 'subvol=@pkg'
@@ -628,7 +628,7 @@
           opts: >-
             {{
               'defaults,nosuid,nodev,noexec'
-              if filesystem != 'btrfs'
+              if system_cfg.filesystem != 'btrfs'
               else [
                 'rw', 'nosuid', 'nodev', 'noexec', 'relatime', partitioning_btrfs_compress_opt,
                 'ssd', 'space_cache=v2', 'discard=async', 'subvol=@var_log_audit'
@@ -655,7 +655,7 @@
       when: system_cfg.features.swap.enabled | bool
       vars:
         partitioning_swap_cmd: >-
-          {{ 'swapon /mnt/swap/swapfile' if filesystem == 'btrfs' else 'swapon -U ' + partitioning_uuid_swap[0] }}
+          {{ 'swapon /mnt/swap/swapfile' if system_cfg.filesystem == 'btrfs' else 'swapon -U ' + partitioning_uuid_swap[0] }}
       ansible.builtin.command: "{{ partitioning_swap_cmd }}"
       register: partitioning_swap_activate_result
       changed_when: partitioning_swap_activate_result.rc == 0