openstack/heat
Code Issues Proposed changes

Merge "heat api : allow validation of YAML templates via cfn api"

Browse Source
This commit is contained in:
Jenkins 2013-02-22 13:11:39 +00:00 committed by Gerrit Code Review
commit 5f18a8147d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/api/cfn/v1/stacks.py
View File

@ -319,7 +319,7 @@ class StackController(object):
try: try:
stack = template_format.parse(templ) stack = template_format.parse(templ)
except ValueError: except ValueError:
msg = _("The Template must be a JSON document.") msg = _("The Template must be a JSON or YAML document.")
return exception.HeatInvalidParameterValueError(detail=msg) return exception.HeatInvalidParameterValueError(detail=msg)
args = {'template': stack, args = {'template': stack,
@ -397,9 +397,9 @@ class StackController(object):
return exception.HeatMissingParameterError(detail=msg) return exception.HeatMissingParameterError(detail=msg)
try: try:
template = json.loads(templ) template = template_format.parse(templ)
except ValueError: except ValueError:
msg = _("The Template must be a JSON document.") msg = _("The Template must be a JSON or YAML document.")
return exception.HeatInvalidParameterValueError(detail=msg) return exception.HeatInvalidParameterValueError(detail=msg)
logger.info('validate_template') logger.info('validate_template')