Merge "Follow-up patch of 565b31424ef4e1441cae022486fa6334a2811d21"
This commit is contained in:
commit
3cfc9be8ca
@ -535,7 +535,6 @@ class IloVirtualMediaBoot(base.BootInterface):
|
|||||||
:raises: IloOperationError, if some operation on iLO failed.
|
:raises: IloOperationError, if some operation on iLO failed.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
LOG.debug("Cleaning up the ironic ramdisk.")
|
|
||||||
ilo_common.cleanup_vmedia_boot(task)
|
ilo_common.cleanup_vmedia_boot(task)
|
||||||
|
|
||||||
def _configure_vmedia_boot(self, task, root_uuid):
|
def _configure_vmedia_boot(self, task, root_uuid):
|
||||||
@ -628,7 +627,6 @@ class IloPXEBoot(pxe.PXEBoot):
|
|||||||
:raises: IloOperationError, if some operation on iLO failed.
|
:raises: IloOperationError, if some operation on iLO failed.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
LOG.debug("Cleaning up the instance.")
|
|
||||||
manager_utils.node_power_action(task, states.POWER_OFF)
|
manager_utils.node_power_action(task, states.POWER_OFF)
|
||||||
disable_secure_boot_if_supported(task)
|
disable_secure_boot_if_supported(task)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user