diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-10 17:23:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-10 17:23:51 +0000 |
| commit | bded82a27e0f89d1416fc32a0e37a6abbe14f4f2 (patch) | |
| tree | dd22385172ac02c29319d8c9fc871f5729e9f760 /ironic | |
| parent | c4721da2d899e1c51e716577e776c6ee14e2e35e (diff) | |
| parent | ca6499b62c47b6588b2382f442dbc690140453d5 (diff) | |
| download | ironic-bded82a27e0f89d1416fc32a0e37a6abbe14f4f2.tar.gz | |
Merge "Make bootloader installation failures fatal for whole disk images"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/agent_base.py | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ironic/drivers/modules/agent_base.py b/ironic/drivers/modules/agent_base.py index 8f5a4412a..371b603a7 100644 --- a/ironic/drivers/modules/agent_base.py +++ b/ironic/drivers/modules/agent_base.py @@ -1335,20 +1335,11 @@ class AgentDeployMixin(HeartbeatMixin, AgentOobStepsMixin): software_raid=software_raid ) if result['command_status'] == 'FAILED': - if not whole_disk_image: - msg = (_("Failed to install a bootloader when " - "deploying node %(node)s. Error: %(error)s") % - {'node': node.uuid, - 'error': agent_client.get_command_error(result)}) - log_and_raise_deployment_error(task, msg) - else: - # Its possible the install will fail if the IPA image - # has not been updated, log this and continue - LOG.info('Could not install bootloader for whole disk ' - 'image for node %(node)s, Error: %(error)s"', - {'node': node.uuid, - 'error': agent_client.get_command_error(result)}) - return + msg = (_("Failed to install a bootloader when " + "deploying node %(node)s. Error: %(error)s") % + {'node': node.uuid, + 'error': agent_client.get_command_error(result)}) + log_and_raise_deployment_error(task, msg) try: persistent = True |