From 42b2c60ce2aeb91a9fda213cda87a22f87bb0161 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 20 Oct 2016 11:59:49 +0200 Subject: [PATCH] Remove "dhcp" command from the iPXE template 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: I97dc897da49ceb8e03476ddacd5bc92dd40aa4b2 Closes-Bug: #1635191 --- ironic/drivers/modules/ipxe_config.template | 2 -- ironic/tests/unit/drivers/ipxe_config.template | 2 -- ironic/tests/unit/drivers/ipxe_config_timeout.template | 2 -- releasenotes/notes/ipxe-dhcp-b799bc326cd2529a.yaml | 4 ++++ 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/ipxe-dhcp-b799bc326cd2529a.yaml diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template index 64b8147d2e..e8fb3d0ff0 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 b48c557305..1357619583 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 70e573c5a4..1b1d05d1e6 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/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.