diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-08-04 08:43:34 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-04 08:57:52 +1200 |
| commit | beca15dec5265783047d5df210b270ed3d77dd4b (patch) | |
| tree | ae0f9d59cc80f1794e8e31c8d150daad11987371 /tripleo_heat_merge/merge.py | |
| parent | 9413fb3098254fb8cbeb5d4951aba474b8755afb (diff) | |
Port all templates to HOT
This change was generated and validated by running the following:
make hot clean all validate-all
This converts all templates to be valid HOT.
Fn::Select is not converted in this change but this will actually
work with heat_template_version 2013-05-23. Fn::Select is converted
manually in the next change in this series.
This change also sets the heat_template_version to 2014-10-16 which
includes the list_join intrinsic functions used throughout these
templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
Diffstat (limited to 'tripleo_heat_merge/merge.py')
| -rw-r--r-- | tripleo_heat_merge/merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py index 077bcb1c..3549769d 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': '2013-05-23', + 'heat_template_version': '2014-10-16', 'description': [] } get_resource = 'get_resource' |