From ef5da773ec0110c6ec3a851072081f867fb973a6 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Fri, 2 Sep 2022 14:54:42 +0200
Subject: [PATCH] Don't inject WDS entries for bootloader 'None'
---
app/models/concerns/foreman_wds/nic_extensions.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/concerns/foreman_wds/nic_extensions.rb b/app/models/concerns/foreman_wds/nic_extensions.rb
index abc8345..6781712 100644
--- a/app/models/concerns/foreman_wds/nic_extensions.rb
+++ b/app/models/concerns/foreman_wds/nic_extensions.rb
@@ -8,7 +8,7 @@ module ForemanWds
end
def boot_server
- return super if host.nil? || !host.wds? || host.wds_facet.nil?
+ return super if host.nil? || !host.wds? || host.wds_facet.nil? || host.pxe_loader.nil? || host.pxe_loader.downcase == 'none'
if host.build? # TODO: Support choosing local boot method
return host.wds_server.next_server_ip unless subnet.dhcp.has_capability?(:DHCP, :dhcp_filename_hostname)
@@ -26,7 +26,7 @@ module ForemanWds
def dhcp_attrs(record_mac)
data = super(record_mac)
- return data if host.nil? || !host.wds?
+ return data if host.nil? || !host.wds? || host.pxe_loader.nil? || host.pxe_loader.downcase == 'none'
arch = WdsServer.wdsify_architecture(host.architecture)
build_stage = host.build? ? :pxe : :local
--
GitLab