From d90144d2190009f8bd121cb8f773a9209500f034 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 1 Jan 2022 20:19:56 +0100 Subject: in-place variable cooking --- .../autoinstall/templates/autoinstall.yml.j2 | 48 +++++++++++----------- roles/installer/ubuntu/iso/tasks/main.yml | 2 +- roles/installer/ubuntu/iso/templates/grub.cfg.j2 | 2 +- .../installer/ubuntu/iso/templates/isolinux.cfg.j2 | 2 +- roles/installer/ubuntu/usb/tasks/main.yml | 2 +- roles/installer/ubuntu/usb/templates/grub.cfg.j2 | 2 +- .../installer/ubuntu/usb/templates/isolinux.cfg.j2 | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'roles/installer/ubuntu') diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 8b4538d5..85fb9d53 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -13,27 +13,27 @@ autoinstall: network: version: 2 ethernets: - {{ install_interface | default(network_cooked.primary.name) }}: + {{ install_interface | default(network.primary.name) }}: {% if install_dhcp | default(false) %} dhcp4: yes {% else %} addresses: - - {{ network_cooked.primary.address }} - gateway4: {{ network_cooked.primary.gateway }} -{% if (network_cooked.nameservers | default([]) | length) > 0 %} + - {{ network.primary.address }} + gateway4: {{ network.primary.gateway }} +{% if (network.nameservers | default([]) | length) > 0 %} nameservers: search: [ {{ host_domain }} ] - addresses: [ {{ network_cooked.nameservers | join(', ') }} ] + addresses: [ {{ network.nameservers | join(', ') }} ] {% endif %} {% endif %} storage: config: -{% if install_cooked.disks.primary != "software-raid" %} +{% if install.disks.primary != "software-raid" %} - id: disk-primary type: disk - path: {{ install_cooked.disks.primary }} -{% if install_cooked.efi | default(false) %} + path: {{ install.disks.primary }} +{% if install.efi | default(false) %} ptable: gpt {% else %} ptable: msdos @@ -41,11 +41,11 @@ autoinstall: {% endif %} wipe: superblock-recursive {% else %} -{% for raid_member in install_cooked.disks.raid.members %} +{% for raid_member in install.disks.raid.members %} - id: raid-disk{{ loop.index }} type: disk path: {{ raid_member }} -{% if install_cooked.efi | default(false) %} +{% if install.efi | default(false) %} ptable: gpt {% else %} ptable: msdos @@ -55,9 +55,9 @@ autoinstall: {% endfor %} {% endif %} -{% if install_cooked.efi | default(false) %} +{% if install.efi | default(false) %} {% set part_offset = 1 %} -{% if install_cooked.disks.primary != "software-raid" %} +{% if install.disks.primary != "software-raid" %} - id: partition-esp type: partition device: disk-primary @@ -75,7 +75,7 @@ autoinstall: device: format-esp path: /boot/efi {% else %} -{% for raid_member in install_cooked.disks.raid.members %} +{% for raid_member in install.disks.raid.members %} - id: partition-esp{{ loop.index }} type: partition device: raid-disk{{ loop.index }} @@ -98,8 +98,8 @@ autoinstall: {% else %} {% set part_offset = 0 %} {% endif %} -{% if install_cooked.disks.primary == "software-raid" %} -{% for raid_member in install_cooked.disks.raid.members %} +{% if install.disks.primary == "software-raid" %} +{% for raid_member in install.disks.raid.members %} - id: raid-partition-boot{{ loop.index }} type: partition device: raid-disk{{ loop.index }} @@ -109,9 +109,9 @@ autoinstall: - id: partition-boot type: raid name: md-boot - raidlevel: {{ install_cooked.disks.raid.level }} + raidlevel: {{ install.disks.raid.level }} devices: -{% for raid_member in install_cooked.disks.raid.members %} +{% for raid_member in install.disks.raid.members %} - raid-partition-boot{{ loop.index }} {% endfor %} - id: format-boot @@ -125,9 +125,9 @@ autoinstall: {% set part_offset = part_offset + 1 %} {% endif %} -{% set system_lvm_size = install_cooked.system_lvm.size | default(ubuntu_autoinstall_system_lvm_size_default) %} -{% set system_lvm_volumes = install_cooked.system_lvm.volumes | default(ubuntu_autoinstall_system_lvm_volumes_default) %} -{% if install_cooked.disks.primary != "software-raid" %} +{% set system_lvm_size = install.system_lvm.size | default(ubuntu_autoinstall_system_lvm_size_default) %} +{% set system_lvm_volumes = install.system_lvm.volumes | default(ubuntu_autoinstall_system_lvm_volumes_default) %} +{% if install.disks.primary != "software-raid" %} - id: partition-lvm type: partition device: disk-primary @@ -144,7 +144,7 @@ autoinstall: size: -1 {% else %} -{% for raid_member in install_cooked.disks.raid.members %} +{% for raid_member in install.disks.raid.members %} - id: raid-partition-lvm{{ loop.index }} type: partition device: raid-disk{{ loop.index }} @@ -162,9 +162,9 @@ autoinstall: - id: partition-lvm type: raid name: md-lvm - raidlevel: {{ install_cooked.disks.raid.level }} + raidlevel: {{ install.disks.raid.level }} devices: -{% for raid_member in install_cooked.disks.raid.members %} +{% for raid_member in install.disks.raid.members %} - raid-partition-lvm{{ loop.index }} {% endfor %} @@ -239,7 +239,7 @@ autoinstall: {% endif %} - curtin in-target --target=/target -- apt-mark manual iputils-ping isc-dhcp-client netcat-openbsd netplan.io sudo - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 multipath-tools ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader open-vm-tools -{% if install_cooked.disks.primary != "software-raid" %} +{% if install.disks.primary != "software-raid" %} - curtin in-target --target=/target -- apt-get -y -q purge mdadm {% endif %} - curtin in-target --target=/target -- env SUDO_FORCE_REMOVE=yes apt-get -y -q purge sudo diff --git a/roles/installer/ubuntu/iso/tasks/main.yml b/roles/installer/ubuntu/iso/tasks/main.yml index ecfc2265..be46d923 100644 --- a/roles/installer/ubuntu/iso/tasks/main.yml +++ b/roles/installer/ubuntu/iso/tasks/main.yml @@ -3,7 +3,7 @@ run_once: true vars: ubuntu_installer_codename: "{{ install_codename }}" - ubuntu_installer_arch: "{{ install_cooked.arch | default('amd64') }}" + ubuntu_installer_arch: "{{ install.arch | default('amd64') }}" ubuntu_installer_variant: "{{ ubuntu_installer_iso_variant }}" import_role: role: installer/ubuntu/fetch diff --git a/roles/installer/ubuntu/iso/templates/grub.cfg.j2 b/roles/installer/ubuntu/iso/templates/grub.cfg.j2 index ccbc25eb..74d7709e 100644 --- a/roles/installer/ubuntu/iso/templates/grub.cfg.j2 +++ b/roles/installer/ubuntu/iso/templates/grub.cfg.j2 @@ -13,6 +13,6 @@ set default=0 menuentry "automated installer for {{ inventory_hostname }}" { set gfxpayload=keep - linux /casper/vmlinuz quiet nopersistent autoinstall "ds=nocloud;s=/cdrom/autoinstall/{{ inventory_hostname }}/" {{ (install_cooked.kernel_cmdline | default([])) | join(' ') }} + linux /casper/vmlinuz quiet nopersistent autoinstall "ds=nocloud;s=/cdrom/autoinstall/{{ inventory_hostname }}/" {{ (install.kernel_cmdline | default([])) | join(' ') }} initrd /casper/initrd } diff --git a/roles/installer/ubuntu/iso/templates/isolinux.cfg.j2 b/roles/installer/ubuntu/iso/templates/isolinux.cfg.j2 index 99401b8b..b407b149 100644 --- a/roles/installer/ubuntu/iso/templates/isolinux.cfg.j2 +++ b/roles/installer/ubuntu/iso/templates/isolinux.cfg.j2 @@ -12,4 +12,4 @@ SAY ** LABEL {{ inventory_hostname }} KERNEL /casper/vmlinuz INITRD /casper/initrd - APPEND quiet nopersistent autoinstall ds=nocloud;s=/cdrom/autoinstall/{{ inventory_hostname }}/ {{ (install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND quiet nopersistent autoinstall ds=nocloud;s=/cdrom/autoinstall/{{ inventory_hostname }}/ {{ (install.kernel_cmdline | default([])) | join(' ') }} diff --git a/roles/installer/ubuntu/usb/tasks/main.yml b/roles/installer/ubuntu/usb/tasks/main.yml index c7eb9e41..94b7c316 100644 --- a/roles/installer/ubuntu/usb/tasks/main.yml +++ b/roles/installer/ubuntu/usb/tasks/main.yml @@ -15,7 +15,7 @@ run_once: true vars: ubuntu_installer_codename: "{{ install_codename }}" - ubuntu_installer_arch: "{{ install_cooked.arch | default('amd64') }}" + ubuntu_installer_arch: "{{ install.arch | default('amd64') }}" ubuntu_installer_variant: "{{ ubuntu_installer_usb_variant }}" import_role: role: installer/ubuntu/fetch diff --git a/roles/installer/ubuntu/usb/templates/grub.cfg.j2 b/roles/installer/ubuntu/usb/templates/grub.cfg.j2 index adeb5672..8282e95c 100644 --- a/roles/installer/ubuntu/usb/templates/grub.cfg.j2 +++ b/roles/installer/ubuntu/usb/templates/grub.cfg.j2 @@ -16,7 +16,7 @@ set default=0 menuentry "automated installer for {{ host }}" { set gfxpayload=keep - linux /casper/vmlinuz quiet nopersistent autoinstall "ds=nocloud;s=/cdrom/autoinstall/{{ host }}/" {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} + linux /casper/vmlinuz quiet nopersistent autoinstall "ds=nocloud;s=/cdrom/autoinstall/{{ host }}/" {{ (hostvars[host].install.kernel_cmdline | default([])) | join(' ') }} initrd /casper/initrd } {% endfor %} diff --git a/roles/installer/ubuntu/usb/templates/isolinux.cfg.j2 b/roles/installer/ubuntu/usb/templates/isolinux.cfg.j2 index 03d581d4..12e7179d 100644 --- a/roles/installer/ubuntu/usb/templates/isolinux.cfg.j2 +++ b/roles/installer/ubuntu/usb/templates/isolinux.cfg.j2 @@ -21,5 +21,5 @@ LABEL {{ host }} MENU LABEL automated installer for {{ host }} KERNEL /casper/vmlinuz INITRD /casper/initrd - APPEND quiet nopersistent autoinstall ds=nocloud;s=/cdrom/autoinstall/{{ host }}/ {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND quiet nopersistent autoinstall ds=nocloud;s=/cdrom/autoinstall/{{ host }}/ {{ (hostvars[host].install.kernel_cmdline | default([])) | join(' ') }} {% endfor %} -- cgit v1.2.3