openstack
/
python-heatclient
Code Issues Proposed changes

Merge "Pass template as a string if it is not JSON."

This commit is contained in:
Jenkins 2012-11-27 23:35:55 +00:00 committed by Gerrit Code Review
parent 23478147aa 3d122cfb54
commit 224eafa18e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heatclient/v1/shell.py
View File

@ -22,7 +22,11 @@ import heatclient.exc as exc
def _set_template_fields(hc, args, fields):
if args.template_file:
fields['template'] = json.loads(open(args.template_file).read())
tpl = open(args.template_file).read()
if tpl.startswith('{'):
fields['template'] = json.loads(tpl)
else:
fields['template'] = tpl
elif args.template_url:
fields['template_url'] = args.template_url
elif args.template_object: