openstack/ironic
Code Issues Proposed changes

Merge "Redfish: fix error formatting when mounting vmedia" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-04-29 17:28:16 +00:00 committed by Gerrit Code Review
commit 1efa611460
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/drivers/modules/redfish/boot.py
View File

@ -224,7 +224,7 @@ def _insert_vmedia(task, managers, boot_url, boot_device):
if err_msgs: if err_msgs:
exc_msg = ("All virtual media mount attempts failed. " exc_msg = ("All virtual media mount attempts failed. "
"Most recent error: ", err_msgs[-1]) "Most recent error: " + err_msgs[-1])
else: else:
exc_msg = 'No suitable virtual media device found' exc_msg = 'No suitable virtual media device found'
raise exception.InvalidParameterValue(exc_msg) raise exception.InvalidParameterValue(exc_msg)
@ -286,11 +286,11 @@ def _insert_vmedia_in_resource(task, resource, boot_url, boot_device,
# by CIMC vKVM - attempts to InsertMedia into those will result # by CIMC vKVM - attempts to InsertMedia into those will result
# in BadRequestError. We catch the exception here so that we don't # in BadRequestError. We catch the exception here so that we don't
# fail out and try the next available device instead, if available. # fail out and try the next available device instead, if available.
except sushy.exceptions.BadRequestError: except sushy.exceptions.BadRequestError as exc:
err_msg = ("Inserting virtual media into %(boot_device)s " err_msg = ("Inserting virtual media into %(boot_device)s "
"failed for node %(node)s, moving to next virtual " "failed for node %(node)s, moving to next virtual "
"media device, if available", "media device, if available. %(exc)s" %
{'node': task.node.uuid, {'node': task.node.uuid, 'exc': exc,
'boot_device': boot_device}) 'boot_device': boot_device})
err_msgs.append(err_msg) err_msgs.append(err_msg)
LOG.warning(err_msg) LOG.warning(err_msg)