openstack/puppet-ironic
Code Issues Proposed changes

Remove "dhcp" command from the iPXE script

Browse Source 
At this point we already have DHCP on the right NIC to be able to download
this iPXE script. The "dhcp" may actually break the boot, as it runs DHCP
on the first available interface, not the PXE booting one.

Change-Id: I9ec62b6b662c9ea70f7cc12bd0567b5e4119faf7
Closes-Bug: #1635191
This commit is contained in:
Dmitry Tantsur 2016-10-20 14:45:55 +02:00
parent bdba53db76
commit 806d5a1569
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/ipxe-dhcp-f82e17c956a5b887.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Remove "dhcp" command from the introspection iPXE script. It is redundant,
and may even break booting when the provisioning NIC is not the first one.

3
templates/inspector_ipxe.erb
View File

@ -1,8 +1,5 @@
#!ipxe
:retry_dhcp
dhcp || goto retry_dhcp
:retry_boot
imgfree
kernel <% if @ipxe_timeout_real != "0" %>--timeout <%= Integer(@ipxe_timeout_real) * 1000 %> <% end %>http://<%= @dnsmasq_local_ip %>:<%= @http_port_real %>/agent.kernel ipa-inspection-callback-url=http://<%= @dnsmasq_local_ip %>:5050/v1/continue ipa-inspection-collectors=<%= @ramdisk_collectors %> systemd.journald.forward_to_console=yes BOOTIF=${mac} <%= @ramdisk_kernel_args %> initrd=agent.ramdisk || goto retry_boot