Fixes #29952 - make Grub2 template bootdisk-efi compatible #738

lzap · 2020-05-28T15:04:37Z

The BOOTIF statement breaks the full host disk. It cannot be set to BOOTIF=01-$mac_default_net because when not PXE/HTTP booting, this variable is NOT set in grub, therefore it renders to BOOTIF=01- which is wrong and dracut cannot initialize the network.

Do not merge yet, testing with @adamruzicka for the latest bootdisk UEFI changes.

timogoebel · 2020-05-28T15:12:55Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

@@ -11,6 +11,13 @@ oses:
 <%
  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
  os_major = @host.operatingsystem.major.to_i
+  # Grub2 does not have IPAPEND feature
+  if @host.provition_interface.mac


Suggested change

if @host.provition_interface.mac

if @host.provision_interface.mac

I am writing this all the time.

timogoebel · 2020-05-28T15:13:25Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

@@ -11,6 +11,13 @@ oses:
 <%
  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
  os_major = @host.operatingsystem.major.to_i
+  # Grub2 does not have IPAPEND feature
+  if @host.provition_interface.mac
+    bootif = "01-#{@host.provition_interface.mac.tr(':','-')}"


Suggested change

bootif = "01-#{@host.provition_interface.mac.tr(':','-')}"

bootif = "01-#{@host.provision_interface.mac.tr(':','-')}"

Yeah muscle memory.

adamruzicka

Added some comments in addition to what Timo said

adamruzicka · 2020-05-29T08:22:32Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

@@ -26,13 +33,13 @@ set default=0
 set timeout=<%= host_param('loader_timeout') || 10 %>

 menuentry '<%= template_name %>' {
-  <%= linuxcmd %> <%= @kernel %> ks=<%= foreman_url('provision') %> <%= pxe_kernel_options %> <%= snippet("kickstart_kernel_options").strip %> BOOTIF=01-$net_default_mac
+<%= linuxcmd %> <%= @kernel %> ks=<%= foreman_url('provision') %> <%= pxe_kernel_options %> <%= snippet("kickstart_kernel_options").strip %> BOOTIF=<%= bootif %>


This renders the following piece on my testing machine

-----B<-----SNIP-----B<----- menuentry 'Kickstart default PXEGrub2 @ b3d7bae' { linux boot/centos-mirror-gTpaQO8OPF0S-vmlinuz ks=http://192.168.122.48/unattended/provision?token=294e47d3-4cf9-48f3-8b08-00d53c973b63 network ksdevice=bootif ks.device=bootif BOOTIF=00-52-54-00-11-11-11 kssendmac ks.sendmac inst.ks.sendmac ip=dhcp BOOTIF=01-52-54-00-11-11-11 initrd boot/centos-mirror-gTpaQO8OPF0S-initrd.img } -----B<-----SNIP-----B<-----

If the same parameter (BOOTIF in this case) is provided, the later one "wins"?

Right, it's actually already defined I am going to drop this. The variable does not need to be used at all, that's for discovery case which is a different template not this one.

adamruzicka · 2020-05-29T09:03:55Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

+  else
+    # this only works for PXE/HTTP UEFI boot
+    bootif = "01-$net_default_mac"
+  end

  if (rhel_compatible && os_major < 7) || !@host.pxe_loader_efi?


I tried provisioning CentOS 7.7.1908 and got linux and initrd as commands, however when booting from the bootdisk image in UEFI mode, grub complained about

error: can't find command 'linux'. error: can't find command 'initrd'.

Changing those by hand to linuxefi and initrdefi made the issue go away

Your PXE loader must include "EFI" string, otherwise it's incorrectly set here.

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

ekohl · 2020-06-01T12:44:44Z

It feels like there's something missing in the PR title. Prevent what?

lzap · 2020-06-01T12:48:28Z

Ameded all your remarks. Also modified the workaround "HTTP Boot" so it actually works with bootdisk. Since network root prefix does not get carried over, this is needed to be used, either HTTP or HTTPS option must be selected manually or via parameter.

@ekohl I will update the title to match the changes

lzap · 2020-06-01T13:15:24Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

+  proxy_http_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "http_port")
+  proxy_https_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "https_port")
+  # workaround around "no DNS server configured" in grub: https://bugzilla.redhat.com/show_bug.cgi?id=1842509
+  proxy_host = dns_lookup(@host.provision_interface.subnet.httpboot.hostname)


It looks like grub is not able to initialize DNS or parsing of hostname with port (satellite:8000) does not resolve correctly. This hack does allow the workflow, without it it would not be possible. I suggest to go with this and we can remove it later once the BZ is fixed. https://bugzilla.redhat.com/show_bug.cgi?id=1842509

adamruzicka · 2020-06-02T08:40:56Z

provisioning_templates/PXEGrub2/kickstart_default_pxegrub2.erb

+  proxy_http_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "http_port")
+  proxy_https_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "https_port")


I'm getting

undefined method '#setting' for SmartProxy::Jail (SmartProxy)

Is there a PR that exposes setting on smart proxy jail t hat I missed?

Damn, I had to turn it off on my instance and forgot this one. Lemme update the other PR then.

lzap · 2020-06-02T10:58:56Z

Pushed, the absolute addressing must be kept because of another grub bug discovered moments ago, so I have added links to both bugs (one is fixed already, one is new - from today).

lzap · 2020-06-03T12:45:01Z

Last minor change which I missed since I was testing with an IP and not hostname:

diff --git a/app/views/foreman_bootdisk/generic_efi_host.erb b/app/views/foreman_bootdisk/generic_efi_host.erb
index 07f243a..b798d2e 100644
--- a/app/views/foreman_bootdisk/generic_efi_host.erb
+++ b/app/views/foreman_bootdisk/generic_efi_host.erb
@@ -16,6 +16,7 @@ echo " * HTTP ONLY (change the template for HTTPS)"
 echo " * ISC DHCP (other servers not tested)"
 echo " * GRUB FROM RHEL 8.3+/7.9+ (when generating the image)"
 echo " * EFI HTTP or HTTPS grub entry must be selected in menu"
+echo " * DNS must resolve proxy hostname via DNS proxy if set"
 echo "*******************************************************"
 sleep 5
 <%
@@ -26,8 +27,9 @@ proxy_proto = "http"
 @subnet.httpboot? || bootdisk_raise("Requires a proxy with httpboot feature")
 @subnet.template? || bootdisk_raise("Requires a proxy with template feature")
 proxy_port = @subnet.httpboot.setting(:HTTPBoot, "#{proxy_proto}_port") || bootdisk_raise("Requires proxy with #{proxy_proto}_port exposed setting")
-proxy_httpboot_host = @subnet.httpboot.hostname
-proxy_template_host = @subnet.template.hostname
+# Workaround for "no DNS server configured" https://bugzilla.redhat.com/show_bug.cgi?id=1842509
+proxy_httpboot_host = dns_lookup(@subnet.httpboot.hostname)
+proxy_template_host = dns_lookup(@subnet.template.hostname)
 -%>
 echo
 net_ls_cards

adamruzicka

This works well

adamruzicka · 2020-06-05T06:11:00Z

Thank you @lzap!

(cherry picked from commit 055f497)

lzap · 2020-06-05T07:55:50Z

CP 2.1: Fixes #29952 - prevent when mac is present (#738) #743

(cherry picked from commit 055f497)

lzap mentioned this pull request May 28, 2020

Fixes #4413 - UEFI support for full and generic theforeman/foreman_bootdisk#93

Merged

theforeman-bot added Needs testing Not yet reviewed Provisioning labels May 28, 2020

timogoebel reviewed May 28, 2020

View reviewed changes

adamruzicka reviewed May 29, 2020

View reviewed changes

lzap force-pushed the bootif-bootdisk-fix-29952 branch 2 times, most recently from 4c51139 to 43d47e4 Compare June 1, 2020 12:34

lzap changed the title ~~Fixes #29952 - prevent when mac is present~~ Fixes #29952 - make Grub2 template bootdisk-efi compatible Jun 1, 2020

lzap commented Jun 1, 2020

View reviewed changes

adamruzicka reviewed Jun 2, 2020

View reviewed changes

lzap force-pushed the bootif-bootdisk-fix-29952 branch from 43d47e4 to f2f58d2 Compare June 2, 2020 10:58

Fixes #29952 - prevent when mac is present

05f8c58

lzap force-pushed the bootif-bootdisk-fix-29952 branch from f2f58d2 to 05f8c58 Compare June 4, 2020 09:50

adamruzicka approved these changes Jun 4, 2020

View reviewed changes

theforeman-bot removed the Not yet reviewed label Jun 4, 2020

adamruzicka merged commit 055f497 into theforeman:develop Jun 5, 2020

lzap deleted the bootif-bootdisk-fix-29952 branch June 5, 2020 07:53

lzap added a commit to lzap/community-templates that referenced this pull request Jun 5, 2020

Fixes #29952 - prevent when mac is present (theforeman#738)

8162407

(cherry picked from commit 055f497)

mmoll pushed a commit that referenced this pull request Jun 5, 2020

Fixes #29952 - prevent when mac is present (#738)

e9fb9ca

(cherry picked from commit 055f497)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #29952 - make Grub2 template bootdisk-efi compatible #738

Fixes #29952 - make Grub2 template bootdisk-efi compatible #738

lzap commented May 28, 2020

timogoebel May 28, 2020

lzap Jun 1, 2020

timogoebel May 28, 2020

lzap Jun 1, 2020

adamruzicka left a comment

adamruzicka May 29, 2020

lzap Jun 1, 2020

adamruzicka May 29, 2020

lzap Jun 1, 2020

ekohl commented Jun 1, 2020

lzap commented Jun 1, 2020

lzap Jun 1, 2020

adamruzicka Jun 2, 2020

lzap Jun 2, 2020

lzap commented Jun 2, 2020

lzap commented Jun 3, 2020

adamruzicka left a comment

adamruzicka commented Jun 5, 2020

lzap commented Jun 5, 2020

	if @host.provition_interface.mac
	if @host.provision_interface.mac

	bootif = "01-#{@host.provition_interface.mac.tr(':','-')}"
	bootif = "01-#{@host.provision_interface.mac.tr(':','-')}"

		proxy_http_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "http_port")
		proxy_https_port = @host.provision_interface.subnet.httpboot.setting(:HTTPBoot, "https_port")

Fixes #29952 - make Grub2 template bootdisk-efi compatible #738

Fixes #29952 - make Grub2 template bootdisk-efi compatible #738

Conversation

lzap commented May 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adamruzicka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ekohl commented Jun 1, 2020

lzap commented Jun 1, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lzap commented Jun 2, 2020

lzap commented Jun 3, 2020

adamruzicka left a comment

Choose a reason for hiding this comment

adamruzicka commented Jun 5, 2020

lzap commented Jun 5, 2020