Refs #36677 - fix tests

theforeman · Aug 22, 2023 · 70c0992 · 70c0992
1 parent e216159
commit 70c0992
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...oningTemplate/PXEGrub2/Preseed_default_PXEGrub2_Autoinstall.ubuntu_autoinst4dhcp.snap.txt b/...oningTemplate/PXEGrub2/Preseed_default_PXEGrub2_Autoinstall.ubuntu_autoinst4dhcp.snap.txt
@@ -15,7 +15,7 @@ set default=0
 set timeout=10
 
 menuentry 'Preseed default PXEGrub2 Autoinstall' {
-  linuxefi boot/ubuntu-mirror-rf32u3HGTMZf-vmlinuz root=/dev/rd/0 rw auto ip=dhcp ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null "ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/" console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
+  linuxefi boot/ubuntu-mirror-rf32u3HGTMZf-vmlinuz root=/dev/rd/0 rw auto ip=dhcp BOOTIF=00-f0-54-1a-7e-e0 ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null "ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/" console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
   initrdefi boot/ubuntu-mirror-rf32u3HGTMZf-initrd
 }
 

diff --git a/...oningTemplate/PXELinux/Preseed_default_PXELinux_Autoinstall.ubuntu_autoinst4dhcp.snap.txt b/...oningTemplate/PXELinux/Preseed_default_PXELinux_Autoinstall.ubuntu_autoinst4dhcp.snap.txt
@@ -19,6 +19,6 @@ DEFAULT linux cloud-init autoinstall
 LABEL linux cloud-init autoinstall
     KERNEL boot/ubuntu-mirror-rf32u3HGTMZf-vmlinuz
     INITRD boot/ubuntu-mirror-rf32u3HGTMZf-initrd
-    APPEND root=/dev/ram0 ip=dhcp ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
+    APPEND root=/dev/ram0 ip=dhcp BOOTIF=00-f0-54-1a-7e-e0 ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
 
 
diff --git a/.../ProvisioningTemplate/iPXE/Preseed_default_iPXE_Autoinstall.ubuntu_autoinst4dhcp.snap.txt b/.../ProvisioningTemplate/iPXE/Preseed_default_iPXE_Autoinstall.ubuntu_autoinst4dhcp.snap.txt
@@ -18,7 +18,7 @@
 #
 
 
-kernel http://archive.ubuntu.com/ubuntu/casper/vmlinuz initrd=initrd root=/dev/rd/0 rw auto ip=dhcp ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
+kernel http://archive.ubuntu.com/ubuntu/casper/vmlinuz initrd=initrd root=/dev/rd/0 rw auto ip=dhcp BOOTIF=00-f0-54-1a-7e-e0 ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
 
 initrd http://archive.ubuntu.com/ubuntu/casper/initrd
 

diff --git a/...isioningTemplate/snippet/preseed_kernel_options_autoinstall.ubuntu_autoinst4dhcp.snap.txt b/...isioningTemplate/snippet/preseed_kernel_options_autoinstall.ubuntu_autoinst4dhcp.snap.txt
@@ -1,3 +1,3 @@
 
 
-ip=dhcp ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com
+ip=dhcp BOOTIF=00-f0-54-1a-7e-e0 ramdisk_size=1500000 fsck.mode=skip autoinstall url=http://archive.ubuntu.com:80/ubuntu.iso cloud-config-url=/dev/null ds=nocloud-net;s=http://foreman.example.com/userdata/00-f0-54-1a-7e-e0/ console-setup/ask_detect=false locale=en_US localechooser/translation/warn-light=true localechooser/translation/warn-severe=true hostname=snapshot-ipv4-dhcp-ubuntu20 domain=snap.example.com