openstack/python-heatclient
Code Issues Proposed changes

Pass template as a string if it is not JSON.

Browse Source 
Test for JSON is whether the first character is '{'

Change-Id: I109d5f12d3874517561631eefac514342761714b
This commit is contained in:
Steve Baker
2012-11-26 13:50:38 +13:00
parent f5ffc5f254
commit 3d122cfb54
1 changed files with 5 additions and 1 deletions
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: