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 --- roles/installer/ubuntu/usb/tasks/main.yml | 2 +- roles/installer/ubuntu/usb/templates/grub.cfg.j2 | 2 +- roles/installer/ubuntu/usb/templates/isolinux.cfg.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'roles/installer/ubuntu/usb') 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