summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-16 21:55:02 +0000
committerGerrit Code Review <review@openstack.org>2018-12-16 21:55:02 +0000
commitf91ca4a22d87f4010134163283934e673a8e5f7e (patch)
tree04027bf39aa2baef4d7a0239ae1dfa77f51f0082
parent5a4c5c85e9367b8a6e978b91114ce133955c4084 (diff)
parentbace9cc248a1121953725ef458c3ab66ce11df33 (diff)
downloadheat-f91ca4a22d87f4010134163283934e673a8e5f7e.tar.gz
Merge "Return execution state_info in ExternalResource" into stable/rocky
-rw-r--r--heat/engine/resources/openstack/mistral/external_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/engine/resources/openstack/mistral/external_resource.py b/heat/engine/resources/openstack/mistral/external_resource.py
index 58142c581..9e8f1b70e 100644
--- a/heat/engine/resources/openstack/mistral/external_resource.py
+++ b/heat/engine/resources/openstack/mistral/external_resource.py
@@ -166,7 +166,7 @@ class MistralExternalResource(resource.Resource):
if execution.state in ('ERROR', 'CANCELLED'):
raise exception.ResourceFailure(
- exception_or_error=execution.state,
+ exception_or_error=execution.state_info,
resource=self,
action=action)