summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-17 13:53:22 +0000
committerGerrit Code Review <review@openstack.org>2023-02-17 13:53:22 +0000
commit67ba0b892f3d9d0a2f0db2bf6a069125fa54e55d (patch)
tree8d4cb0cbb2c655c621616e1b6afcdc954faaa6f5
parent8d2d0bfc8bbb24e27beb6c4784e980e4d5e86f98 (diff)
parent25718f5fcf0a00a48f6bb62fc668b65a724f69cb (diff)
downloadironic-67ba0b892f3d9d0a2f0db2bf6a069125fa54e55d.tar.gz
Merge "Indicate maintenance mode"
-rw-r--r--ironic/conductor/manager.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index a5817cf2e..c658ae8a6 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -2034,9 +2034,9 @@ class ConductorManager(base_manager.BaseConductorManager):
'node %(node)s: %(e)s',
{'node': node.uuid, 'e': e})
else:
- LOG.error('Swift object cannot be orphaned during '
- 'destruction of node %(node)s: %(e)s',
- {'node': node.uuid, 'e': e})
+ LOG.error('Swift object cannot be orphaned without '
+ 'maintenance mode during destruction of node '
+ '%(node)s: %(e)s', {'node': node.uuid, 'e': e})
raise
except Exception as err:
LOG.error('Failed to delete Swift entries related '