Merge "Fixes use of pre-existing workflows for OS::Mistral::Workflow"

This commit is contained in:
Jenkins 2017-05-23 12:10:29 +00:00 committed by Gerrit Code Review
commit 455ef4b48c
2 changed files with 3 additions and 7 deletions

View File

@ -506,12 +506,7 @@ class Workflow(signal_responder.SignalResponder,
current_task = {}
wf_value = task.get(self.WORKFLOW)
if wf_value is not None:
if wf_value in [res.resource_id
for res in six.itervalues(self.stack)]:
current_task.update({self.WORKFLOW: wf_value})
else:
msg = _("No such workflow %s") % wf_value
raise ValueError(msg)
current_task.update({self.WORKFLOW: wf_value})
# backward support for kilo.
if task.get(self.POLICIES) is not None:

View File

@ -131,7 +131,8 @@ resources:
- wait_instance
- name: on_error
action: std.echo output="output"
- name: external_workflow
workflow: external_workflow_name
"""
workflow_updating_request_body_property = """