Merge "Limit maximum size of all templates"

diff --cc etc/heat/heat.conf.sample
Simple merge

diff --cc heat/common/config.py
Simple merge

diff --cc heat/common/template_format.py
Simple merge

diff --cc heat/tests/test_template_format.py
index 8bde30d600520c94dd2db22df5fb7300b023b054,da98752f4127009e0fc574d53bbc82e0645028ad..6128a9b039f452b049d51de59600f587bf4663c4
--- 1/heat/tests/test_template_format.py
--- 2/heat/tests/test_template_format.py
+++ b/heat/tests/test_template_format.py
@@@ -89,7 -92,34 +92,16 @@@ Outputs: {
          tpl2 = template_format.parse(yaml2)
          self.assertEqual(tpl1, tpl2)
  
+     def test_long_yaml(self):
+         template = {'HeatTemplateVersion': '2012-12-12'}
+         template['Resources'] = ['a'] * (config.cfg.CONF.max_template_size / 3)
+         limit = config.cfg.CONF.max_template_size
+         long_yaml = yaml.safe_dump(template)
+         self.assertTrue(len(long_yaml) > limit)
+         self.assertRaises(exception.TemplateTooBig, template_format.parse,
+                           long_yaml)
+ 
  
 -class YamlEnvironmentTest(HeatTestCase):
 -
 -    def test_no_template_sections(self):
 -        env = '''
 -parameters: {}
 -resource_registry: {}
 -'''
 -        parsed_env = template_format.parse(env, add_template_sections=False)
 -
 -        self.assertEqual('parameters' in parsed_env, True)
 -        self.assertEqual('resource_registry' in parsed_env, True)
 -
 -        self.assertEqual('Parameters' in parsed_env, False)
 -        self.assertEqual('Mappings' in parsed_env, False)
 -        self.assertEqual('Resources' in parsed_env, False)
 -        self.assertEqual('Outputs' in parsed_env, False)
 -
 -
  class JsonYamlResolvedCompareTest(HeatTestCase):
  
      def setUp(self):