diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-09 01:02:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-09 01:02:18 +0000 |
| commit | 47a7fb5ff7338b5e135a30bd59fa9a81d453a8b8 (patch) | |
| tree | def14a4948886c57ac23db47bf9d704e79c1db9d | |
| parent | 2acdf3cd17f5fc87b1c8fde4a01b5857213e6643 (diff) | |
| parent | cb836a29bf046b948567552037819e8183f8ce15 (diff) | |
| download | ironic-python-agent-47a7fb5ff7338b5e135a30bd59fa9a81d453a8b8.tar.gz | |
Merge "Trivial: minor fixes in error messages"8.2.0
| -rw-r--r-- | ironic_python_agent/extensions/clean.py | 2 | ||||
| -rw-r--r-- | ironic_python_agent/extensions/deploy.py | 2 | ||||
| -rw-r--r-- | ironic_python_agent/extensions/standby.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ironic_python_agent/extensions/clean.py b/ironic_python_agent/extensions/clean.py index 5eabded0..87d2a4fe 100644 --- a/ironic_python_agent/extensions/clean.py +++ b/ironic_python_agent/extensions/clean.py @@ -74,7 +74,7 @@ class CleanExtension(base.BaseAgentExtension): try: result = hardware.dispatch_to_managers(step['step'], node, ports) except Exception as e: - msg = ('Error performing clean_step %(step)s: %(err)s' % + msg = ('Error performing clean step %(step)s: %(err)s' % {'step': step['step'], 'err': e}) LOG.exception(msg) raise errors.CleaningError(msg) diff --git a/ironic_python_agent/extensions/deploy.py b/ironic_python_agent/extensions/deploy.py index 31936ad4..33366891 100644 --- a/ironic_python_agent/extensions/deploy.py +++ b/ironic_python_agent/extensions/deploy.py @@ -76,7 +76,7 @@ class DeployExtension(base.BaseAgentExtension): result = hardware.dispatch_to_managers(step['step'], node, ports, **kwargs) except Exception as e: - msg = ('Error performing deploy_step %(step)s: %(err)s' % + msg = ('Error performing deploy step %(step)s: %(err)s' % {'step': step['step'], 'err': e}) LOG.exception(msg) raise errors.DeploymentError(msg) diff --git a/ironic_python_agent/extensions/standby.py b/ironic_python_agent/extensions/standby.py index e63a9572..623423b9 100644 --- a/ironic_python_agent/extensions/standby.py +++ b/ironic_python_agent/extensions/standby.py @@ -523,7 +523,7 @@ def _validate_partitioning(device): except (processutils.UnknownArgumentError, processutils.ProcessExecutionError, OSError) as e: msg = ("Unable to find a valid partition table on the disk after " - "writing the image. Error {}".format(e)) + f"writing the image. The image may be corrupted. Error: {e}") raise exception.InstanceDeployFailure(msg) # Check if there is at least one partition in the partition table after |