openstack/ironic
Code Issues Proposed changes

Merge "Fix anaconda stage2_id loading from image properties"

Browse Source
This commit is contained in:
Zuul 2023-05-19 09:25:40 +00:00 committed by Gerrit Code Review
commit 91e6a86fbe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/common/pxe_utils.py
View File

@ -720,6 +720,7 @@ def get_instance_image_info(task, ipxe_enabled=False):
# TODO(TheJulia): Add functionality to look/grab the hints file
# for anaconda and just run with the entire path.
if 'stage2' in anaconda_labels:
# stage2: installer stage2 squashfs image
# ks_template: anaconda kickstart template
# ks_cfg - rendered ks_template
@ -1160,7 +1161,7 @@ def validate_kickstart_file(ks_cfg):
ks_file.flush()
try:
utils.execute(
'ksvalidator', ks_file.name, check_on_exit=[0], attempts=1
'ksvalidator', ks_file.name, check_exit_code=[0], attempts=1
)
except processutils.ProcessExecutionError as e:
msg = (_("The kickstart file generated does not pass validation. "