openstack/tripleo-common
Code Issues Proposed changes

Merge "Convert exceptions to strings when passing them to the Result class"

Browse Source
This commit is contained in:
Jenkins
2016-12-13 12:57:11 +00:00
committed by Gerrit Code Review
parent 7d1756f307 0aee2ceb3c
commit 54e51b0e6f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/actions/baremetal.py
View File

@@ -17,6 +17,7 @@ import logging
import ironic_inspector_client import ironic_inspector_client
from mistral.workflow import utils as mistral_workflow_utils from mistral.workflow import utils as mistral_workflow_utils
from oslo_utils import units from oslo_utils import units
import six
from tripleo_common.actions import base from tripleo_common.actions import base
from tripleo_common import exception from tripleo_common import exception
@@ -67,7 +68,7 @@ class RegisterOrUpdateNodes(base.TripleOAction):
ramdisk_name=self.ramdisk_name) ramdisk_name=self.ramdisk_name)
except Exception as err: except Exception as err:
LOG.exception("Error registering nodes with ironic.") LOG.exception("Error registering nodes with ironic.")
return mistral_workflow_utils.Result(error=err) return mistral_workflow_utils.Result(error=six.text_type(err))
class ConfigureBootAction(base.TripleOAction): class ConfigureBootAction(base.TripleOAction):
@@ -130,7 +131,7 @@ class ConfigureBootAction(base.TripleOAction):
LOG.debug("Configuring boot option for Node %s", self.node_uuid) LOG.debug("Configuring boot option for Node %s", self.node_uuid)
except Exception as err: except Exception as err:
LOG.exception("Error configuring node boot options with Ironic.") LOG.exception("Error configuring node boot options with Ironic.")
return mistral_workflow_utils.Result(error=err) return mistral_workflow_utils.Result(error=six.text_type(err))
class ConfigureRootDeviceAction(base.TripleOAction): class ConfigureRootDeviceAction(base.TripleOAction):

2
tripleo_common/actions/parameters.py
View File

@@ -153,7 +153,7 @@ class GeneratePasswordsAction(base.TripleOAction):
except Exception: except Exception:
msg = "Error retrieving mistral environment: %s" % self.container msg = "Error retrieving mistral environment: %s" % self.container
LOG.exception(msg) LOG.exception(msg)
return mistral_workflow_utils.Result("", msg) return mistral_workflow_utils.Result(error=msg)
try: try:
stack_env = orchestration.stacks.environment( stack_env = orchestration.stacks.environment(