diff options
| author | Dmitry Tantsur <divius.inside@gmail.com> | 2016-10-20 11:59:49 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <divius.inside@gmail.com> | 2016-11-02 13:38:25 +0100 |
| commit | fa44688a9716e24f9547d1583ec99c435308da12 (patch) | |
| tree | daa499615d37cfaebf8120e2a9306713be8c9f9e | |
| parent | 574a836f1ca27a81df5f447ebf811aa0aefb18d3 (diff) | |
| download | ironic-fa44688a9716e24f9547d1583ec99c435308da12.tar.gz | |
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
(cherry picked from commit 42b2c60ce2aeb91a9fda213cda87a22f87bb0161)
5 files changed, 4 insertions, 8 deletions
diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template index 43519ef10..03c5a1e6e 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 13489537a..78674859e 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 7a64f2284..acfe4727c 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 6061a3c29..f2852ed55 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 000000000..bbee8e05e --- /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. |