diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template index 5fba7215ee..ff6f8494fe 100644 --- a/ironic/drivers/modules/ipxe_config.template +++ b/ironic/drivers/modules/ipxe_config.template @@ -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 diff --git a/ironic/tests/unit/drivers/ipxe_config.template b/ironic/tests/unit/drivers/ipxe_config.template index 16c0e9b972..d02c8dcd47 100644 --- a/ironic/tests/unit/drivers/ipxe_config.template +++ b/ironic/tests/unit/drivers/ipxe_config.template @@ -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 diff --git a/ironic/tests/unit/drivers/ipxe_config_boot_from_volume.template b/ironic/tests/unit/drivers/ipxe_config_boot_from_volume.template index 480d4637a1..32bda03073 100644 --- a/ironic/tests/unit/drivers/ipxe_config_boot_from_volume.template +++ b/ironic/tests/unit/drivers/ipxe_config_boot_from_volume.template @@ -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 \ No newline at end of file +sanboot --no-describe diff --git a/ironic/tests/unit/drivers/ipxe_config_boot_from_volume_no_volumes.template b/ironic/tests/unit/drivers/ipxe_config_boot_from_volume_no_volumes.template index 3229eca22a..77c8f418b1 100644 --- a/ironic/tests/unit/drivers/ipxe_config_boot_from_volume_no_volumes.template +++ b/ironic/tests/unit/drivers/ipxe_config_boot_from_volume_no_volumes.template @@ -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 \ No newline at end of file +sanboot --no-describe diff --git a/ironic/tests/unit/drivers/ipxe_config_timeout.template b/ironic/tests/unit/drivers/ipxe_config_timeout.template index 103a34dfd8..8318b480f3 100644 --- a/ironic/tests/unit/drivers/ipxe_config_timeout.template +++ b/ironic/tests/unit/drivers/ipxe_config_timeout.template @@ -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 diff --git a/releasenotes/notes/ipxe-command-line-ip-argument-4e92cf8bb912f62d.yaml b/releasenotes/notes/ipxe-command-line-ip-argument-4e92cf8bb912f62d.yaml new file mode 100644 index 0000000000..9e3bc35420 --- /dev/null +++ b/releasenotes/notes/ipxe-command-line-ip-argument-4e92cf8bb912f62d.yaml @@ -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 `_.