From beca15dec5265783047d5df210b270ed3d77dd4b Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 4 Aug 2014 08:43:34 +1200 Subject: 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 --- examples/launchconfig1_hot.yaml | 2 +- examples/launchconfig2_hot.yaml | 2 +- examples/launchconfig_result_hot.yaml | 2 +- examples/scale1_hot.yaml | 2 +- examples/scale2_hot.yaml | 2 +- examples/scale_map2_hot.yaml | 2 +- examples/scale_map_hot.yaml | 2 +- examples/scale_map_result_hot.yaml | 2 +- examples/scale_result_hot.yaml | 2 +- examples/source2_lib_result_hot.yaml | 2 +- examples/source_hot.yaml | 2 +- examples/source_include_subkey_hot.yaml | 2 +- examples/source_include_subkey_result_hot.yaml | 2 +- examples/source_lib_result_hot.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'examples') diff --git a/examples/launchconfig1_hot.yaml b/examples/launchconfig1_hot.yaml index 1354f469..4c86e76d 100644 --- a/examples/launchconfig1_hot.yaml +++ b/examples/launchconfig1_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: A: type: string diff --git a/examples/launchconfig2_hot.yaml b/examples/launchconfig2_hot.yaml index 3bd5549d..1586a4d0 100644 --- a/examples/launchconfig2_hot.yaml +++ b/examples/launchconfig2_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: C: type: string diff --git a/examples/launchconfig_result_hot.yaml b/examples/launchconfig_result_hot.yaml index e3019f20..1375bae9 100644 --- a/examples/launchconfig_result_hot.yaml +++ b/examples/launchconfig_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/launchconfig1_hot.yaml,examples/launchconfig2_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' parameters: A: default: test1 diff --git a/examples/scale1_hot.yaml b/examples/scale1_hot.yaml index 5597bbbf..6e46a32d 100644 --- a/examples/scale1_hot.yaml +++ b/examples/scale1_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 resources: ComputeUser: type: AWS::IAM::User diff --git a/examples/scale2_hot.yaml b/examples/scale2_hot.yaml index 8800a6c8..0f3989cb 100644 --- a/examples/scale2_hot.yaml +++ b/examples/scale2_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: ComputeImage: type: string diff --git a/examples/scale_map2_hot.yaml b/examples/scale_map2_hot.yaml index b2b6dfbb..1d7dc5fc 100644 --- a/examples/scale_map2_hot.yaml +++ b/examples/scale_map2_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: AllHosts: type: string diff --git a/examples/scale_map_hot.yaml b/examples/scale_map_hot.yaml index 282d49bb..24c14dcc 100644 --- a/examples/scale_map_hot.yaml +++ b/examples/scale_map_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 resources: ComputeUser: type: AWS::IAM::User diff --git a/examples/scale_map_result_hot.yaml b/examples/scale_map_result_hot.yaml index 5976e54e..69f0f241 100644 --- a/examples/scale_map_result_hot.yaml +++ b/examples/scale_map_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/scale_map_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' resources: ComputeUser: properties: diff --git a/examples/scale_result_hot.yaml b/examples/scale_result_hot.yaml index 17c05147..c9f865a5 100644 --- a/examples/scale_result_hot.yaml +++ b/examples/scale_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/scale1_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' resources: ComputeUser: properties: diff --git a/examples/source2_lib_result_hot.yaml b/examples/source2_lib_result_hot.yaml index 3f891e47..294fed89 100644 --- a/examples/source2_lib_result_hot.yaml +++ b/examples/source2_lib_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/source2_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' parameters: BImage: type: string diff --git a/examples/source_hot.yaml b/examples/source_hot.yaml index e8dd59a3..7b47f2b5 100644 --- a/examples/source_hot.yaml +++ b/examples/source_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: SourceImage: type: string diff --git a/examples/source_include_subkey_hot.yaml b/examples/source_include_subkey_hot.yaml index b330efe6..8970db44 100644 --- a/examples/source_include_subkey_hot.yaml +++ b/examples/source_include_subkey_hot.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 parameters: Foo: type: string diff --git a/examples/source_include_subkey_result_hot.yaml b/examples/source_include_subkey_result_hot.yaml index f8853c23..ec3bfb6f 100644 --- a/examples/source_include_subkey_result_hot.yaml +++ b/examples/source_include_subkey_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/source_include_subkey_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' parameters: Foo: type: string diff --git a/examples/source_lib_result_hot.yaml b/examples/source_lib_result_hot.yaml index 4c07da0c..0235f200 100644 --- a/examples/source_lib_result_hot.yaml +++ b/examples/source_lib_result_hot.yaml @@ -1,5 +1,5 @@ description: examples/source_hot.yaml -heat_template_version: '2013-05-23' +heat_template_version: '2014-10-16' parameters: SourceImage: default: my_image -- cgit 1.2.3-korg