Merge "Fix passing workflow input via UI"

This commit is contained in:
Jenkins
2014-10-24 12:15:44 +00:00
committed by Gerrit Code Review

View File

@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import json import json
import six
from mistralclient.api import base from mistralclient.api import base
@@ -30,7 +31,10 @@ class ExecutionManager(base.ResourceManager):
data = {'workflow_name': workflow_name} data = {'workflow_name': workflow_name}
if workflow_input: if workflow_input:
data.update({'input': json.dumps(workflow_input)}) if isinstance(workflow_input, six.string_types):
data.update({'input': workflow_input})
else:
data.update({'input': json.dumps(workflow_input)})
if params: if params:
data.update({'params': json.dumps(params)}) data.update({'params': json.dumps(params)})