openstack/ironic
Code Issues Proposed changes

Merge "Drop references to RPC calls from user-visible errors"

Browse Source
This commit is contained in:
Jenkins 2016-06-27 13:02:44 +00:00 committed by Gerrit Code Review
commit a6e19588b8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ironic/conductor/manager.py
View File

@ -446,8 +446,8 @@ class ConductorManager(base_manager.BaseConductorManager):
except (exception.InvalidParameterValue, except (exception.InvalidParameterValue,
exception.MissingParameterValue) as e: exception.MissingParameterValue) as e:
raise exception.InstanceDeployFailure( raise exception.InstanceDeployFailure(
_("RPC do_node_deploy failed to validate deploy or " _("Failed to validate deploy or power info for node "
"power info for node %(node_uuid)s. Error: %(msg)s") % "%(node_uuid)s. Error: %(msg)s") %
{'node_uuid': node.uuid, 'msg': e}) {'node_uuid': node.uuid, 'msg': e})
LOG.debug("do_node_deploy Calling event: %(event)s for node: " LOG.debug("do_node_deploy Calling event: %(event)s for node: "
@ -644,8 +644,8 @@ class ConductorManager(base_manager.BaseConductorManager):
try: try:
task.driver.power.validate(task) task.driver.power.validate(task)
except exception.InvalidParameterValue as e: except exception.InvalidParameterValue as e:
msg = (_('RPC do_node_clean failed to validate power info.' msg = (_('Failed to validate power info. '
' Cannot clean node %(node)s. Error: %(msg)s') % 'Cannot clean node %(node)s. Error: %(msg)s') %
{'node': node.uuid, 'msg': e}) {'node': node.uuid, 'msg': e})
raise exception.InvalidParameterValue(msg) raise exception.InvalidParameterValue(msg)
@ -1994,8 +1994,8 @@ class ConductorManager(base_manager.BaseConductorManager):
task.driver.inspect.validate(task) task.driver.inspect.validate(task)
except (exception.InvalidParameterValue, except (exception.InvalidParameterValue,
exception.MissingParameterValue) as e: exception.MissingParameterValue) as e:
error = (_("RPC inspect_hardware failed to validate " error = (_("Failed to validate inspection or power info. "
"inspection or power info. Error: %(msg)s") "Error: %(msg)s")
% {'msg': e}) % {'msg': e})
raise exception.HardwareInspectionFailure(error=error) raise exception.HardwareInspectionFailure(error=error)