refactor(bootstrap): restructure package lists to self-contained per-OS dicts with base/extra/conditional

roles/bootstrap/tasks/ubuntu.yml

@@ -6,38 +6,22 @@
       ubuntu: plucky
       ubuntu-lts: noble
     bootstrap_ubuntu_release: "{{ bootstrap_ubuntu_release_map[os] | default('noble') }}"
-    bootstrap_ubuntu_package_config: >-
+    _config: "{{ lookup('vars', bootstrap_var_key) }}"
+    bootstrap_ubuntu_base_csv: "{{ (['ca-certificates'] + _config.base) | unique | join(',') }}"
+    bootstrap_ubuntu_extra_args: >-
       {{
-        lookup('vars', bootstrap_var_key)
-      }}
-    bootstrap_ubuntu_base_packages: >-
-      {{
-        bootstrap_ubuntu_package_config.base
-        | default([])
+        ((_config.extra | default([])) + (_config.conditional | default([])))
         | reject('equalto', '')
-        | list
+        | join(' ')
       }}
-    bootstrap_ubuntu_extra_packages: >-
-      {{
-        bootstrap_ubuntu_package_config.extra
-        | default([])
-        | reject('equalto', '')
-        | list
-      }}
-    bootstrap_ubuntu_base_csv: "{{ bootstrap_ubuntu_base_packages | join(',') }}"
-    bootstrap_ubuntu_extra: "{{ bootstrap_ubuntu_extra_packages | join(' ') }}"
   block:
     - name: Validate Ubuntu package configuration
       ansible.builtin.assert:
         that:
-          - bootstrap_ubuntu_package_config is mapping
-          - bootstrap_ubuntu_package_config.base is defined
-          - bootstrap_ubuntu_package_config.base is sequence
-          - bootstrap_ubuntu_package_config.base is not string
-          - bootstrap_ubuntu_package_config.extra is defined
-          - bootstrap_ubuntu_package_config.extra is sequence
-          - bootstrap_ubuntu_package_config.extra is not string
-        fail_msg: "bootstrap package definition for {{ bootstrap_var_key }} must be a mapping with base/extra lists."
+          - _config is mapping
+          - _config.base is sequence
+          - _config.extra is sequence
+        fail_msg: "{{ bootstrap_var_key }} must be a dict with base/extra/conditional keys."
         quiet: true
 
     - name: Install Ubuntu base system
@@ -46,7 +30,7 @@
         --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg
         --include={{ bootstrap_ubuntu_base_csv }}
         {{ bootstrap_ubuntu_release }} /mnt
-        http://archive.ubuntu.com/ubuntu/
+        https://archive.ubuntu.com/ubuntu/
       register: bootstrap_ubuntu_base_result
       changed_when: bootstrap_ubuntu_base_result.rc == 0
 
@@ -62,7 +46,7 @@
       changed_when: bootstrap_ubuntu_update_result.rc == 0
 
     - name: Install extra packages
-      when: bootstrap_ubuntu_extra_packages | length > 0
-      ansible.builtin.command: "{{ chroot_command }} apt install -y {{ bootstrap_ubuntu_extra }}"
+      when: bootstrap_ubuntu_extra_args | trim | length > 0
+      ansible.builtin.command: "{{ chroot_command }} apt install -y {{ bootstrap_ubuntu_extra_args }}"
       register: bootstrap_ubuntu_extra_result
       changed_when: bootstrap_ubuntu_extra_result.rc == 0