summaryrefslogtreecommitdiff
path: root/ironic/conductor/utils.py
diff options
context:
space:
mode:
authorAeva Black <aeva.online@gmail.com>2019-12-23 17:57:17 -0800
committerJulia Kreger <juliaashleykreger@gmail.com>2020-04-13 07:29:37 -0700
commit9f75bbd938dae085b7c6985ae3d591c1e7f5ef55 (patch)
tree7857173f86f8a21445eb655ff3ecad9bfa292605 /ironic/conductor/utils.py
parent1dee25f554ab928ecdc6b7e3dd691eabf3db0ee4 (diff)
downloadironic-9f75bbd938dae085b7c6985ae3d591c1e7f5ef55.tar.gz
Add my new address to .mailmap
This commit updates the mailmap file and changes my alias in a few places within old comments. Change-Id: Ica0e184109d794b8e129d567b5606d7fe84ff384
Diffstat (limited to 'ironic/conductor/utils.py')
-rw-r--r--ironic/conductor/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py
index e537219c6..ca399b651 100644
--- a/ironic/conductor/utils.py
+++ b/ironic/conductor/utils.py
@@ -369,7 +369,7 @@ def provisioning_error_handler(e, node, provision_state,
"""
if isinstance(e, exception.NoFreeConductorWorker):
- # NOTE(deva): there is no need to clear conductor_affinity
+ # NOTE(tenbrae): there is no need to clear conductor_affinity
# because it isn't updated on a failed deploy
node.provision_state = provision_state
node.target_provision_state = target_provision_state
@@ -499,7 +499,7 @@ def deploying_error_handler(task, logmsg, errmsg=None, traceback=False,
node.last_error = cleanup_err
node.save()
- # NOTE(deva): there is no need to clear conductor_affinity
+ # NOTE(tenbrae): there is no need to clear conductor_affinity
task.process_event('fail')