summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-27 11:27:27 +0000
committerGerrit Code Review <review@openstack.org>2020-04-27 11:27:27 +0000
commite8f0c9d9aef1b8688b3ad3ac077f9b8d4ea4c18c (patch)
tree7bea08ede7a1c875a6412191582cbe3d57315e90
parentf8c97c6c2a5ef00a80da24ef2e89828f8d64292e (diff)
parentac6de2b2560820c7c4f929ba2ec8293d782fd9ca (diff)
downloadironic-e8f0c9d9aef1b8688b3ad3ac077f9b8d4ea4c18c.tar.gz
Merge "Make deploy step failure logging indicate the error" into stable/stein
-rw-r--r--ironic/conductor/manager.py5
-rw-r--r--releasenotes/notes/deploy-step-error-d343e8cb7d1b2305.yaml6
2 files changed, 10 insertions, 1 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index 466e96c53..677d2d0c2 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -3862,7 +3862,10 @@ def _do_next_deploy_step(task, step_index, conductor_id):
{'node': node.uuid, 'step': node.deploy_step, 'err': e})
utils.deploying_error_handler(
task, log_msg,
- _("Failed to deploy: %s") % node.deploy_step)
+ _("Failed to deploy: Deploy step %(step)s, "
+ "error: %(err)s.") % {
+ 'step': node.deploy_step,
+ 'err': e})
return
except Exception as e:
log_msg = ('Node %(node)s failed deploy step %(step)s with '
diff --git a/releasenotes/notes/deploy-step-error-d343e8cb7d1b2305.yaml b/releasenotes/notes/deploy-step-error-d343e8cb7d1b2305.yaml
new file mode 100644
index 000000000..9af1e9782
--- /dev/null
+++ b/releasenotes/notes/deploy-step-error-d343e8cb7d1b2305.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fixes vague node ``last_error`` field reporting upon deploy step
+ failure by providing the exception error message in addition
+ to the step that failed.