Split bootstrap by OS

roles/bootstrap/tasks/almalinux.yml

@@ -0,0 +1,25 @@
+---
+- name: Bootstrap AlmaLinux 9
+  vars:
+    bootstrap_alma_extra: >-
+      {{
+        (
+          (
+            lookup('vars', bootstrap_var_key)
+            | difference(bootstrap_guest_agent_remove_packages)
+          )
+          + bootstrap_guest_agent_packages
+        )
+        | join(' ')
+      }}
+  ansible.builtin.command: "{{ item }}"
+  loop:
+    - >-
+        dnf --releasever=9 --best --repo=alma-baseos --installroot=/mnt
+        --setopt=install_weak_deps=False groupinstall -y base core
+    - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
+    - >-
+        arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False
+        install -y {{ bootstrap_alma_extra }}
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/archlinux.yml

@@ -0,0 +1,15 @@
+---
+- name: Bootstrap ArchLinux
+  vars:
+    bootstrap_archlinux_packages: >-
+      {{
+        (
+          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
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/debian.yml

@@ -0,0 +1,29 @@
+---
+- name: Bootstrap Debian System
+  vars:
+    bootstrap_debian_release: >-
+      {{
+        'bullseye' if bootstrap_os_key == 'debian11'
+        else 'bookworm' if bootstrap_os_key == 'debian12'
+        else 'trixie'
+      }}
+    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_extra: >-
+      {{
+        (
+          (bootstrap_debian_extra_list | difference(bootstrap_guest_agent_remove_packages))
+          + bootstrap_guest_agent_packages
+        )
+        | join(' ')
+      }}
+  ansible.builtin.command: "{{ item }}"
+  loop:
+    - >-
+        debootstrap --include={{ bootstrap_debian_base }}
+        {{ bootstrap_debian_release }} /mnt http://deb.debian.org/debian/
+    - "arch-chroot /mnt apt install -y {{ bootstrap_debian_extra }}"
+    - arch-chroot /mnt apt remove -y libcups2 libavahi-common3 libavahi-common-data
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/fedora.yml

@@ -0,0 +1,27 @@
+---
+- name: Bootstrap Fedora 42
+  vars:
+    bootstrap_fedora_extra: >-
+      {{
+        (
+          (
+            lookup('vars', bootstrap_var_key)
+            | difference(bootstrap_guest_agent_remove_packages)
+          )
+          + bootstrap_guest_agent_packages
+        )
+        | join(' ')
+      }}
+  ansible.builtin.command: "{{ item }}"
+  loop:
+    - >-
+        dnf --releasever=42 --best --repo=fedora --repo=fedora-updates
+        --installroot=/mnt --setopt=install_weak_deps=False
+        groupinstall -y critical-path-base core
+    - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
+    - >-
+        arch-chroot /mnt dnf --releasever=42 --setopt=install_weak_deps=False
+        install -y {{ bootstrap_fedora_extra }}
+    - arch-chroot /mnt dnf reinstall -y kernel-core
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/main.yml

@@ -1,101 +1,43 @@
 ---
 - name: Run OS-specific bootstrap process
+  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: Bootstrap ArchLinux
-      when: os | lower == 'archlinux'
-      ansible.builtin.command: pacstrap /mnt {{ archlinux | join(' ') }} --asexplicit
-      changed_when: result.rc == 0
-      register: result
+    - name: Include AlmaLinux bootstrap tasks
+      when: bootstrap_os_key == 'almalinux'
+      ansible.builtin.include_tasks: almalinux.yml
 
-    - name: Bootstrap Debian System
-      when: os | lower in ['debian11', 'debian12', 'debian13']
-      ansible.builtin.command: "{{ item }}"
-      changed_when: result.rc == 0
-      register: result
-      with_items:
-        - debootstrap --include={{ vars[os].base | join(',') }} {{ 'bullseye' if os == 'debian11' else 'bookworm' if os == 'debian12' else 'trixie' }}
-          /mnt http://deb.debian.org/debian/
-        - arch-chroot /mnt apt install -y {{ vars[os].extra | join(' ') }}
-        - arch-chroot /mnt apt remove -y libcups2 libavahi-common3 libavahi-common-data
+    - name: Include ArchLinux bootstrap tasks
+      when: bootstrap_os_key == 'archlinux'
+      ansible.builtin.include_tasks: archlinux.yml
 
-    - name: Bootstrap Ubuntu System
-      when: os | lower in ['ubuntu', 'ubuntu-lts']
-      ansible.builtin.command: "{{ item }}"
-      changed_when: result.rc == 0
-      register: result
-      with_items:
-        - debootstrap --include={{ vars[os].base | join(',') }} {{ 'plucky' if os == 'ubuntu' else 'noble' }}
-          /mnt http://archive.ubuntu.com/ubuntu/
-        - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-        - arch-chroot /mnt sed -i '1s|$| universe|' /etc/apt/sources.list
-        - arch-chroot /mnt apt update -y
-        - arch-chroot /mnt apt install -y {{ vars[os].extra | join(' ') }}
+    - name: Include Debian bootstrap tasks
+      when: bootstrap_os_key in ['debian11', 'debian12', 'debian13']
+      ansible.builtin.include_tasks: debian.yml
 
-    - name: Bootstrap AlmaLinux 9
-      when: os | lower == 'almalinux'
-      ansible.builtin.command: "{{ item }}"
-      changed_when: result.rc == 0
-      register: result
-      with_items:
-        - dnf --releasever=9 --best --repo=alma-baseos --installroot=/mnt --setopt=install_weak_deps=False groupinstall -y base core
-        - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-        - arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False install -y {{ almalinux | join(' ') }}
+    - name: Include Fedora bootstrap tasks
+      when: bootstrap_os_key == 'fedora'
+      ansible.builtin.include_tasks: fedora.yml
 
-    - name: Bootstrap Fedora 42
-      when: os | lower == 'fedora'
-      ansible.builtin.command: "{{ item }}"
-      changed_when: result.rc == 0
-      register: result
-      with_items:
-        - dnf --releasever=42 --best --repo=fedora --repo=fedora-updates
-          --installroot=/mnt --setopt=install_weak_deps=False groupinstall -y critical-path-base core
-        - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-        - arch-chroot /mnt dnf --releasever=42 --setopt=install_weak_deps=False install -y {{ fedora | join(' ') }}
-        - arch-chroot /mnt dnf reinstall -y kernel-core
+    - name: Include Rocky bootstrap tasks
+      when: bootstrap_os_key == 'rocky'
+      ansible.builtin.include_tasks: rocky.yml
 
-    - name: Bootstrap RockyLinux 9
-      when: os | lower == 'rocky'
-      ansible.builtin.command: "{{ item }}"
-      changed_when: result.rc == 0
-      register: result
-      with_items:
-        - dnf --releasever=9 --best --repo=rocky-baseos --installroot=/mnt
-          --setopt=install_weak_deps=False --setopt=optional_metadata_types=filelists
-          groupinstall -y base core
-        - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-        - arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False install -y {{ rocky | join(' ') }}
+    - name: Include RHEL bootstrap tasks
+      when: bootstrap_os_key in ['rhel8', 'rhel9', 'rhel10']
+      ansible.builtin.include_tasks: rhel.yml
 
-    - name: Bootstrap RHEL System
-      when: os | lower in ['rhel8', 'rhel9', 'rhel10']
-      block:
-        - name: Install base packages in chroot environment
-          ansible.builtin.command: >-
-            dnf --releasever={{ os | lower | replace('rhel', '') }} --repo={{ os | lower }}-baseos
-            --installroot=/mnt
-            --setopt=install_weak_deps=False --setopt=optional_metadata_types=filelists
-            groupinstall -y core base standard
-          changed_when: result.rc == 0
-          register: result
-
-        - name: Prepare chroot environment
-          ansible.builtin.shell: |
-            ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-            mkdir -p /mnt/usr/local/install/redhat/dvd
-            mount --bind /usr/local/install/redhat/dvd /mnt/usr/local/install/redhat/dvd
-            arch-chroot /mnt rpm --rebuilddb
-          changed_when: result.rc == 0
-          register: result
-
-        - name: Copy RHEL repo file into chroot environment
-          ansible.builtin.copy:
-            src: /etc/yum.repos.d/{{ os | lower }}.repo
-            dest: /mnt/etc/yum.repos.d/redhat.repo
-            mode: "0644"
-            remote_src: true
-
-        - name: Install additional packages in chroot
-          ansible.builtin.command: >-
-            arch-chroot /mnt dnf --releasever={{ os | lower | replace('rhel', '') }}
-            --setopt=install_weak_deps=False install -y {{ vars[os] | join(' ') }}
-          changed_when: result.rc == 0
-          register: result
+    - name: Include Ubuntu bootstrap tasks
+      when: bootstrap_os_key in ['ubuntu', 'ubuntu-lts']
+      ansible.builtin.include_tasks: ubuntu.yml

roles/bootstrap/tasks/rhel.yml

@@ -0,0 +1,71 @@
+---
+- name: Bootstrap RHEL System
+  block:
+    - name: Install base packages in chroot environment
+      vars:
+        bootstrap_rhel_release: "{{ bootstrap_os_key | replace('rhel', '') }}"
+      ansible.builtin.command: >-
+        dnf --releasever={{ bootstrap_rhel_release }} --repo={{ bootstrap_os_key }}-baseos
+        --installroot=/mnt
+        --setopt=install_weak_deps=False --setopt=optional_metadata_types=filelists
+        groupinstall -y core base standard
+      register: bootstrap_result
+      changed_when: bootstrap_result.rc == 0
+
+    - name: Ensure chroot has resolv.conf
+      ansible.builtin.file:
+        src: /run/NetworkManager/resolv.conf
+        dest: /mnt/etc/resolv.conf
+        state: link
+        force: true
+
+    - name: Ensure chroot RHEL DVD directory exists
+      ansible.builtin.file:
+        path: /mnt/usr/local/install/redhat/dvd
+        state: directory
+        mode: "0755"
+
+    - name: Bind mount RHEL DVD into chroot
+      ansible.posix.mount:
+        src: /usr/local/install/redhat/dvd
+        path: /mnt/usr/local/install/redhat/dvd
+        fstype: none
+        opts: bind
+        state: mounted
+
+    - name: Rebuild RPM database inside chroot
+      ansible.builtin.command:
+        argv:
+          - arch-chroot
+          - /mnt
+          - rpm
+          - --rebuilddb
+      register: bootstrap_rpm_rebuild_result
+      changed_when: bootstrap_rpm_rebuild_result.rc == 0
+
+    - name: Copy RHEL repo file into chroot environment
+      ansible.builtin.copy:
+        src: /etc/yum.repos.d/{{ bootstrap_os_key }}.repo
+        dest: /mnt/etc/yum.repos.d/redhat.repo
+        mode: "0644"
+        remote_src: true
+
+    - name: Install additional packages in chroot
+      vars:
+        bootstrap_rhel_release: "{{ bootstrap_os_key | replace('rhel', '') }}"
+        bootstrap_rhel_extra: >-
+          {{
+            (
+              (
+                lookup('vars', bootstrap_var_key)
+                | difference(bootstrap_guest_agent_remove_packages)
+              )
+              + bootstrap_guest_agent_packages
+            )
+            | join(' ')
+          }}
+      ansible.builtin.command: >-
+        arch-chroot /mnt dnf --releasever={{ bootstrap_rhel_release }}
+        --setopt=install_weak_deps=False install -y {{ bootstrap_rhel_extra }}
+      register: bootstrap_result
+      changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/rocky.yml

@@ -0,0 +1,26 @@
+---
+- name: Bootstrap RockyLinux 9
+  vars:
+    bootstrap_rocky_extra: >-
+      {{
+        (
+          (
+            lookup('vars', bootstrap_var_key)
+            | difference(bootstrap_guest_agent_remove_packages)
+          )
+          + bootstrap_guest_agent_packages
+        )
+        | join(' ')
+      }}
+  ansible.builtin.command: "{{ item }}"
+  loop:
+    - >-
+        dnf --releasever=9 --best --repo=rocky-baseos --installroot=/mnt
+        --setopt=install_weak_deps=False --setopt=optional_metadata_types=filelists
+        groupinstall -y base core
+    - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
+    - >-
+        arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False
+        install -y {{ bootstrap_rocky_extra }}
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0

roles/bootstrap/tasks/ubuntu.yml

@@ -0,0 +1,27 @@
+---
+- name: Bootstrap Ubuntu System
+  vars:
+    bootstrap_ubuntu_release: >-
+      {{ '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_extra: >-
+      {{
+        (
+          (bootstrap_ubuntu_extra_list | difference(bootstrap_guest_agent_remove_packages))
+          + bootstrap_guest_agent_packages
+        )
+        | join(' ')
+      }}
+  ansible.builtin.command: "{{ item }}"
+  loop:
+    - >-
+        debootstrap --include={{ bootstrap_ubuntu_base }}
+        {{ bootstrap_ubuntu_release }} /mnt http://archive.ubuntu.com/ubuntu/
+    - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
+    - arch-chroot /mnt sed -i '1s|$| universe|' /etc/apt/sources.list
+    - arch-chroot /mnt apt update
+    - "arch-chroot /mnt apt install -y {{ bootstrap_ubuntu_extra }}"
+  register: bootstrap_result
+  changed_when: bootstrap_result.rc == 0