openstack/ironic
Code Issues Proposed changes

Remove ip parameter from ipxe command line

Browse Source 
Due to dracut changes, we can no longer use BOOTIF on the
same command line, and the lack of an ``autoconf`` parameter
results in DHCP being utilized, which is also incompatible with
the ``ip`` command on the kernel command line.

The history of the ip parameter is to allow the kernel to skip
executing DHCP again, but typially it is done anyway so it seemes
that it was redundant to begin with.

Change-Id: I1d2ebafea39d27941178f22b36dcc37a73848cf3
Story: #2001969
Task: #16141
This commit is contained in:
Julia Kreger 2018-05-04 12:24:37 -07:00
parent 94b10d7ab3
commit 02aad838a5
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/ipxe_config.template
View File

@ -4,7 +4,7 @@ goto deploy
:deploy
imgfree
kernel {% if pxe_options.ipxe_timeout > 0 %}--timeout {{ pxe_options.ipxe_timeout }} {% endif %}{{ pxe_options.deployment_aki_path }} selinux=0 troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} ipa-api-url={{ pxe_options['ipa-api-url'] }} initrd={{ pxe_options.initrd_filename|default("deploy_ramdisk", true) }} coreos.configdrive=0 || goto deploy
kernel {% if pxe_options.ipxe_timeout > 0 %}--timeout {{ pxe_options.ipxe_timeout }} {% endif %}{{ pxe_options.deployment_aki_path }} selinux=0 troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} BOOTIF=${mac} ipa-api-url={{ pxe_options['ipa-api-url'] }} initrd={{ pxe_options.initrd_filename|default("deploy_ramdisk", true) }} coreos.configdrive=0 || goto deploy
initrd {% if pxe_options.ipxe_timeout > 0 %}--timeout {{ pxe_options.ipxe_timeout }} {% endif %}{{ pxe_options.deployment_ari_path }} || goto deploy
boot

2
ironic/tests/unit/drivers/ipxe_config.template
View File

@ -4,7 +4,7 @@ goto deploy
:deploy
imgfree
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
initrd http://1.2.3.4:1234/deploy_ramdisk || goto deploy
boot

4
ironic/tests/unit/drivers/ipxe_config_boot_from_volume.template
View File

@ -4,7 +4,7 @@ goto deploy
:deploy
imgfree
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
initrd http://1.2.3.4:1234/deploy_ramdisk || goto deploy
boot
@ -30,4 +30,4 @@ sleep 10
goto boot_iscsi
:boot_whole_disk
sanboot --no-describe
sanboot --no-describe

4
ironic/tests/unit/drivers/ipxe_config_boot_from_volume_no_volumes.template
View File

@ -4,7 +4,7 @@ goto deploy
:deploy
imgfree
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
kernel http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
initrd http://1.2.3.4:1234/deploy_ramdisk || goto deploy
boot
@ -29,4 +29,4 @@ sleep 10
goto boot_iscsi
:boot_whole_disk
sanboot --no-describe
sanboot --no-describe

2
ironic/tests/unit/drivers/ipxe_config_timeout.template
View File

@ -4,7 +4,7 @@ goto deploy
:deploy
imgfree
kernel --timeout 120 http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
kernel --timeout 120 http://1.2.3.4:1234/deploy_kernel selinux=0 troubleshoot=0 text test_param BOOTIF=${mac} ipa-api-url=http://192.168.122.184:6385 initrd=deploy_ramdisk coreos.configdrive=0 || goto deploy
initrd --timeout 120 http://1.2.3.4:1234/deploy_ramdisk || goto deploy
boot

7
releasenotes/notes/ipxe-command-line-ip-argument-4e92cf8bb912f62d.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The iPXE template kernel command line argument ``ip`` has been removed as it
is incompatible with the ``BOOTIF`` and missing ``autoconf`` parameters with
dracut. Further details can be found in
`storyboard <https://storyboard.openstack.org/#!/story/2001969>`_.