heat api : allow validation of YAML templates via cfn api

Currently validation only works if the template is json

fixes bug 1131290

Change-Id: Ia08ba7cc18908697b5fdfc1eb711d84d7b39c7cb
This commit is contained in:
Steven Hardy 2013-02-21 17:29:21 +00:00
parent 409a2705b3
commit a2911cebd6
1 changed files with 3 additions and 3 deletions

View File

@ -319,7 +319,7 @@ class StackController(object):
try:
stack = template_format.parse(templ)
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)
args = {'template': stack,
@ -397,9 +397,9 @@ class StackController(object):
return exception.HeatMissingParameterError(detail=msg)
try:
template = json.loads(templ)
template = template_format.parse(templ)
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)
logger.info('validate_template')