openstack/ironic
Code Issues Proposed changes

Backward compatibility for the ramdisk_params change

Browse Source 
Follow-up to commit 08fe4af481 restoring
support for ipa-api-url in custom templates and adding a release note
explaining the change.

Story: #1528920
Change-Id: Ic8fc31fcde9a6f685bb1390a75a6a010c149f628
This commit is contained in:
Dmitry Tantsur 2019-11-04 14:11:05 +01:00
parent acfc2ea440
commit db31628dea
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

@ -160,6 +160,9 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
pxe_options = pxe_utils.build_pxe_config_options( pxe_options = pxe_utils.build_pxe_config_options(
task, pxe_info, ipxe_enabled=True, ramdisk_params=ramdisk_params) 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) 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( pxe_options = pxe_utils.build_pxe_config_options(
task, pxe_info, ipxe_enabled=ipxe_enabled, task, pxe_info, ipxe_enabled=ipxe_enabled,
ramdisk_params=ramdisk_params) 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) 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.