Fix pxe issues with modern Foreman

app/models/concerns/foreman_wds/host_extensions.rb

@@ -41,11 +41,13 @@ module ForemanWds
 
     def capabilities
       return super + [:wds] if compute_resource && (os.nil? || os.family == 'Windows')
+
       super
     end
 
     def bare_metal_capabilities
       return super + [:wds] if os.nil? || os.family == 'Windows'
+
       super
     end
 
@@ -57,6 +59,12 @@ module ForemanWds
       provision_method == 'wds'
     end
 
+    def pxe_build?
+      return true if wds_build?
+
+      super
+    end
+
     def wds?
       managed? && wds_build? && SETTINGS[:unattended]
     end

app/models/concerns/foreman_wds/nic_extensions.rb

@@ -10,7 +10,9 @@ module ForemanWds
     def boot_server
       return super if host.nil? || !host.wds? || host.wds_facet.nil?
 
-      host.wds_server.next_server_ip if host.build? # TODO: Support choosing local boot method
+      return host.wds_server.next_server_ip if host.build? # TODO: Support choosing local boot method
+
+      super
     end
 
     def dhcp_records