From 9d7d8e7042b23832e6dc973cfd06e758ea2129e2 Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Thu, 31 Aug 2017 14:07:55 -0400 Subject: [PATCH] Fixes for Ironic-inspector introspection when client using UEFI This fixes an issue during introspection when the client loops over ipxe.efi when using UEFI. In addition it adds support to handle clients which report UEFI client architecture type 9 (EFI x86-64). Change-Id: I236a58aab4000395154e5f463bad07f65b8d8b64 Closes-Bug: 1714320 --- templates/inspector_dnsmasq_http.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/inspector_dnsmasq_http.erb b/templates/inspector_dnsmasq_http.erb index de99c9d6..d68db179 100644 --- a/templates/inspector_dnsmasq_http.erb +++ b/templates/inspector_dnsmasq_http.erb @@ -20,9 +20,10 @@ dhcp-option=option:router,<%= s['gateway'] %> dhcp-sequential-ip dhcp-match=ipxe,175 dhcp-match=set:efi,option:client-arch,7 -# Client is running iPXE; move to next stage of chainloading +dhcp-match=set:efi,option:client-arch,9 +# Client is already running iPXE; move to next stage of chainloading dhcp-boot=tag:ipxe,http://<%= @dnsmasq_local_ip %>:<%= @http_port_real %>/inspector.ipxe -# Client is running PXE over EFI; send EFI version of iPXE chainloader -dhcp-boot=tag:efi,ipxe.efi +# Client is PXE booting over EFI without iPXE ROM; send EFI version of iPXE chainloader +dhcp-boot=tag:efi,tag:!ipxe,ipxe.efi # Client is running PXE over BIOS; send BIOS version of iPXE chainloader dhcp-boot=undionly.kpxe,localhost.localdomain,<%= @dnsmasq_local_ip %>