openstack/ironic
Code Issues Proposed changes

Fix Redfish RAID deploy steps

Browse Source 
Change-Id: I423b387a9fe9b4d0a13ecf31a89f04c32cb26950
This commit is contained in:
Aija Jauntēva 2021-12-29 09:28:26 -05:00
parent 1a03e61329
commit 6fed0964a5
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ironic/drivers/modules/redfish/raid.py
View File

@ -1016,8 +1016,8 @@ class RedfishRAID(base.RAIDInterface):
@periodics.node_periodic( @periodics.node_periodic(
purpose='checking async RAID config failed', purpose='checking async RAID config failed',
spacing=CONF.redfish.raid_config_fail_interval, spacing=CONF.redfish.raid_config_fail_interval,
filters={'reserved': False, 'provision_state': states.CLEANFAIL, filters={'reserved': False, 'provision_state_in': {
'maintenance': True}, states.CLEANFAIL, states.DEPLOYFAIL}, 'maintenance': True},
predicate_extra_fields=['driver_internal_info'], predicate_extra_fields=['driver_internal_info'],
predicate=lambda n: n.driver_internal_info.get('raid_configs'), predicate=lambda n: n.driver_internal_info.get('raid_configs'),
) )
@ -1038,7 +1038,8 @@ class RedfishRAID(base.RAIDInterface):
@periodics.node_periodic( @periodics.node_periodic(
purpose='checking async RAID config tasks', purpose='checking async RAID config tasks',
spacing=CONF.redfish.raid_config_status_interval, spacing=CONF.redfish.raid_config_status_interval,
filters={'reserved': False, 'provision_state': states.CLEANWAIT}, filters={'reserved': False, 'provision_state_in': {
states.CLEANWAIT, states.DEPLOYWAIT}},
predicate_extra_fields=['driver_internal_info'], predicate_extra_fields=['driver_internal_info'],
predicate=lambda n: n.driver_internal_info.get('raid_configs'), predicate=lambda n: n.driver_internal_info.get('raid_configs'),
) )
@ -1116,4 +1117,7 @@ class RedfishRAID(base.RAIDInterface):
self._clear_raid_configs(node) self._clear_raid_configs(node)
LOG.info('RAID configuration completed for node %(node)s', LOG.info('RAID configuration completed for node %(node)s',
{'node': node.uuid}) {'node': node.uuid})
manager_utils.notify_conductor_resume_clean(task) if task.node.clean_step:
manager_utils.notify_conductor_resume_clean(task)
else:
manager_utils.notify_conductor_resume_deploy(task)

7
releasenotes/notes/fix-redfish-raid-deploy-steps-e9ee1ea3d1f2a475.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes hardware type ``redfish`` RAID interface deploy steps when completion
requires rebooting system for non-immediate configuration application.
Prior to this fix such nodes would remain in ``wait call-back`` state
indefinitely.