Condition LUKS and guest tools in bootstrap vars

roles/bootstrap/tasks/almalinux.yml

@@ -4,11 +4,7 @@
     bootstrap_alma_extra: >-
       {{
         (
-          (
+          lookup('vars', bootstrap_var_key)
-            lookup('vars', bootstrap_var_key)
-            | difference(bootstrap_guest_agent_remove_packages)
-          )
-          + bootstrap_guest_agent_packages
         )
         | join(' ')
       }}

roles/bootstrap/tasks/archlinux.yml

@@ -3,11 +3,7 @@
   vars:
     bootstrap_archlinux_packages: >-
       {{
-        (
+        lookup('vars', bootstrap_var_key)
-          lookup('vars', bootstrap_var_key)
-          | difference(bootstrap_guest_agent_remove_packages)
-        )
-        + bootstrap_guest_agent_packages
       }}
   ansible.builtin.command: >-
     pacstrap /mnt {{ bootstrap_archlinux_packages | join(' ') }} --asexplicit

roles/bootstrap/tasks/debian.yml

@@ -9,12 +9,11 @@
       }}
     bootstrap_debian_base_list: "{{ lookup('vars', bootstrap_var_key).base | default([]) }}"
     bootstrap_debian_extra_list: "{{ lookup('vars', bootstrap_var_key).extra | default([]) }}"
-    bootstrap_debian_base: "{{ (bootstrap_debian_base_list | difference(bootstrap_guest_agent_remove_packages)) | join(',') }}"
+    bootstrap_debian_base: "{{ bootstrap_debian_base_list | join(',') }}"
     bootstrap_debian_extra: >-
       {{
         (
-          (bootstrap_debian_extra_list | difference(bootstrap_guest_agent_remove_packages))
+          bootstrap_debian_extra_list
-          + bootstrap_guest_agent_packages
         )
         | join(' ')
       }}

roles/bootstrap/tasks/fedora.yml

@@ -4,11 +4,7 @@
     bootstrap_fedora_extra: >-
       {{
         (
-          (
+          lookup('vars', bootstrap_var_key)
-            lookup('vars', bootstrap_var_key)
-            | difference(bootstrap_guest_agent_remove_packages)
-          )
-          + bootstrap_guest_agent_packages
         )
         | join(' ')
       }}

roles/bootstrap/tasks/main.yml

@@ -3,16 +3,6 @@
   vars:
     bootstrap_os_key: "{{ os | lower }}"
     bootstrap_var_key: "{{ 'bootstrap_' + (os | lower | replace('-', '_')) }}"
-    bootstrap_hypervisor_key: "{{ hypervisor | default('none') | lower }}"
-    bootstrap_guest_agent_packages: >-
-      {{
-        ['qemu-guest-agent'] if bootstrap_hypervisor_key in ['libvirt', 'proxmox']
-        else ['open-vm-tools'] if bootstrap_hypervisor_key == 'vmware'
-        else []
-      }}
-    bootstrap_guest_agent_remove_packages:
-      - open-vm-tools
-      - qemu-guest-agent
   block:
     - name: Include AlmaLinux bootstrap tasks
       when: bootstrap_os_key == 'almalinux'

roles/bootstrap/tasks/rhel.yml

@@ -56,11 +56,7 @@
         bootstrap_rhel_extra: >-
           {{
             (
-              (
+              lookup('vars', bootstrap_var_key)
-                lookup('vars', bootstrap_var_key)
-                | difference(bootstrap_guest_agent_remove_packages)
-              )
-              + bootstrap_guest_agent_packages
             )
             | join(' ')
           }}

roles/bootstrap/tasks/rocky.yml

@@ -4,11 +4,7 @@
     bootstrap_rocky_extra: >-
       {{
         (
-          (
+          lookup('vars', bootstrap_var_key)
-            lookup('vars', bootstrap_var_key)
-            | difference(bootstrap_guest_agent_remove_packages)
-          )
-          + bootstrap_guest_agent_packages
         )
         | join(' ')
       }}

roles/bootstrap/tasks/ubuntu.yml

@@ -5,12 +5,11 @@
       {{ 'plucky' if bootstrap_os_key == 'ubuntu' else 'noble' }}
     bootstrap_ubuntu_base_list: "{{ lookup('vars', bootstrap_var_key).base | default([]) }}"
     bootstrap_ubuntu_extra_list: "{{ lookup('vars', bootstrap_var_key).extra | default([]) }}"
-    bootstrap_ubuntu_base: "{{ (bootstrap_ubuntu_base_list | difference(bootstrap_guest_agent_remove_packages)) | join(',') }}"
+    bootstrap_ubuntu_base: "{{ bootstrap_ubuntu_base_list | join(',') }}"
     bootstrap_ubuntu_extra: >-
       {{
         (
-          (bootstrap_ubuntu_extra_list | difference(bootstrap_guest_agent_remove_packages))
+          bootstrap_ubuntu_extra_list
-          + bootstrap_guest_agent_packages
         )
         | join(' ')
       }}

roles/configuration/tasks/bootloader.yml

@@ -5,7 +5,7 @@
       vars:
         configuration_use_efibootmgr: "{{ is_rhel | default(false) }}"
         configuration_efi_dir: >-
-          {{ "/boot/efi" if os | lower in ["ubuntu", "ubuntu-lts"] else "/boot" }}
+          {{ "/boot/efi" if (is_debian | default(false) or is_rhel | default(false)) else "/boot" }}
         configuration_bootloader_id: >-
           {{ "ubuntu" if os | lower in ["ubuntu", "ubuntu-lts"] else os }}
         configuration_efi_vendor: >-

roles/partitioning/tasks/main.yml

@@ -492,7 +492,7 @@
 
     - name: Mount boot filesystem
       ansible.posix.mount:
-        path: "{{ '/mnt/boot/efi' if os | lower in ['rhel8', 'ubuntu', 'ubuntu-lts'] else '/mnt/boot' }}"
+        path: "{{ '/mnt/boot/efi' if (is_debian | default(false) or is_rhel | default(false)) else '/mnt/boot' }}"
         src: UUID={{ partitioning_boot_uuid.stdout }}
         fstype: vfat
         state: mounted