openstack
/
ironic-python-agent
Code Issues Proposed changes

Merge "Log a warning of target_boot_mode does not match current boot mode" into stable/victoria

This commit is contained in:
Zuul 2020-10-08 15:24:21 +00:00 committed by Gerrit Code Review
parent 840e165385 7705b3f72c
commit d5ebdfe1b3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic_python_agent/extensions/image.py
View File

@ -728,7 +728,15 @@ class ImageExtension(base.BaseAgentExtension):
device = hardware.dispatch_to_managers('get_os_install_device')
if self.agent.iscsi_started:
iscsi.clean_up(device)
boot = hardware.dispatch_to_managers('get_boot_info')
if boot.current_boot_mode != target_boot_mode:
LOG.warning('Boot mode mismatch: target boot mode is %(target)s, '
'current boot mode is %(current)s. Installing boot '
'loader may fail or work incorrectly.',
{'target': target_boot_mode,
'current': boot.current_boot_mode})
# FIXME(arne_wiebalck): make software RAID work with efibootmgr
if (boot.current_boot_mode == 'uefi'
and not hardware.is_md_device(device)):