summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorhuangtianhua <huangtianhua@huawei.com>2016-07-22 15:50:20 +0800
committerhuangtianhua <huangtianhua@huawei.com>2016-08-03 09:17:31 +0800
commit70c4ab3fcf921bd29f92f745aedabab14c1b6cd0 (patch)
treeccbdd1d000f52a8dede8a9d3aed56e0935aeb07b /setup.cfg
parent6c9f33dade53c1e8a010954484538a15ea92a990 (diff)
downloadheat-70c4ab3fcf921bd29f92f745aedabab14c1b6cd0.tar.gz
Support 'conditions' section for templates
This changes: 1. Support 'Conditions' for AWSTemplateFormatVersion: 2010-09-09 2. Support 'conditions' for heat_template_version: 2016-10-14 3. There is no need to add a new HeatTemplateFormatVersion template, because we decide to support conditions in AWSTemplateFormatVersion and heat_template_version: 2016-10-14, so remove the HeatTemplateFormatVersion.2016-10-14 4. Move the definition of function 'equals' to hot/functions.py 5. Mark 'equals' as condition function which supported in conditions. Change-Id: I2e7bdfa1c2052e75f35f2bd0003cdc170188d8b8 Blueprint: support-conditions-function
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg1
1 files changed, 0 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index 2e1c6c504..4c4aabdc2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -155,7 +155,6 @@ heat.templates =
heat_template_version.2016-04-08 = heat.engine.hot.template:HOTemplate20160408
heat_template_version.2016-10-14 = heat.engine.hot.template:HOTemplate20161014
heat_template_version.newton = heat.engine.hot.template:HOTemplate20161014
- HeatTemplateFormatVersion.2016-10-14 = heat.engine.cfn.template:HeatTemplate20161014
[global]
setup-hooks =