diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template index 43519ef10a..03c5a1e6e3 100644 --- a/ironic/drivers/modules/ipxe_config.template +++ b/ironic/drivers/modules/ipxe_config.template @@ -1,7 +1,5 @@ #!ipxe -dhcp - goto deploy :deploy diff --git a/ironic/tests/unit/drivers/ipxe_config.template b/ironic/tests/unit/drivers/ipxe_config.template index 13489537ae..78674859ec 100644 --- a/ironic/tests/unit/drivers/ipxe_config.template +++ b/ironic/tests/unit/drivers/ipxe_config.template @@ -1,7 +1,5 @@ #!ipxe -dhcp - goto deploy :deploy diff --git a/ironic/tests/unit/drivers/ipxe_config_timeout.template b/ironic/tests/unit/drivers/ipxe_config_timeout.template index 7a64f22842..acfe4727c8 100644 --- a/ironic/tests/unit/drivers/ipxe_config_timeout.template +++ b/ironic/tests/unit/drivers/ipxe_config_timeout.template @@ -1,7 +1,5 @@ #!ipxe -dhcp - goto deploy :deploy diff --git a/ironic/tests/unit/drivers/ipxe_uefi_config.template b/ironic/tests/unit/drivers/ipxe_uefi_config.template index 6061a3c294..f2852ed554 100644 --- a/ironic/tests/unit/drivers/ipxe_uefi_config.template +++ b/ironic/tests/unit/drivers/ipxe_uefi_config.template @@ -1,7 +1,5 @@ #!ipxe -dhcp - goto deploy :deploy diff --git a/releasenotes/notes/ipxe-dhcp-b799bc326cd2529a.yaml b/releasenotes/notes/ipxe-dhcp-b799bc326cd2529a.yaml new file mode 100644 index 0000000000..bbee8e05ee --- /dev/null +++ b/releasenotes/notes/ipxe-dhcp-b799bc326cd2529a.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Remove "dhcp" command from the default iPXE script. It is redundant, and + may even break booting when the provisioning NIC is not the first one.