From a2911cebd6e9c66a64ad95c4b7351a5f5002d640 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 21 Feb 2013 17:29:21 +0000 Subject: [PATCH] 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 --- heat/api/cfn/v1/stacks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 2be5c5eecf..413e32394a 100644 --- a/heat/api/cfn/v1/stacks.py +++ b/heat/api/cfn/v1/stacks.py @@ -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')