summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2014-08-11 09:18:01 +1200
committerSteve Baker <sbaker@redhat.com>2014-08-13 10:53:46 +1200
commit8a99e7d461f211f43751d5c72c8dbc5d1ae05ead (patch)
treed6501865d4dedeb5019cec00db64c3fd9ead7076 /tripleo_heat_merge
parenta569866c31d698f651612c0dbbe2de8ae7f73708 (diff)
Switch to heat_template_version: 2013-05-23
To support underclouds and seeds running older than the very latest heat. 2013-05-23 lacks function list_join, so this change reverts to using the equivalent function Fn::Join. Change-Id: I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08 Closes-Bug: #1354305
Diffstat (limited to 'tripleo_heat_merge')
-rw-r--r--tripleo_heat_merge/merge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py
index 3549769d..077bcb1c 100644
--- a/tripleo_heat_merge/merge.py
+++ b/tripleo_heat_merge/merge.py
@@ -26,7 +26,7 @@ class Cfn(object):
class Hot(object):
base_template = {
- 'heat_template_version': '2014-10-16',
+ 'heat_template_version': '2013-05-23',
'description': []
}
get_resource = 'get_resource'