openstack
/
ironic
Code Issues Proposed changes

Merge "Backward compatibility for the ramdisk_params change"

This commit is contained in:
Zuul 2019-11-21 08:46:01 +00:00 committed by Gerrit Code Review
parent 306aaccca6 db31628dea
commit 8990e7dcbc
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/ipxe.py
View File

@ -162,6 +162,9 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
pxe_options = pxe_utils.build_pxe_config_options(
task, pxe_info, ipxe_enabled=True, ramdisk_params=ramdisk_params)
# TODO(dtantsur): backwards compability hack, remove in the V release
if ramdisk_params.get("ipa-api-url"):
pxe_options["ipa-api-url"] = ramdisk_params["ipa-api-url"]
pxe_config_template = deploy_utils.get_pxe_config_template(node)

3
ironic/drivers/modules/pxe.py
View File

@ -166,6 +166,9 @@ class PXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
pxe_options = pxe_utils.build_pxe_config_options(
task, pxe_info, ipxe_enabled=ipxe_enabled,
ramdisk_params=ramdisk_params)
# TODO(dtantsur): backwards compability hack, remove in the V release
if ramdisk_params.get("ipa-api-url"):
pxe_options["ipa-api-url"] = ramdisk_params["ipa-api-url"]
pxe_config_template = deploy_utils.get_pxe_config_template(node)

6
releasenotes/notes/ramdisk-params-6083bfaa7ffa9dfe.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The operators using custom PXE/iPXE/Grub templates should update them to
remove an explicit mention of ``ipa-api-url``. This field is now a part
of ``pxe_append_params`` when required.