From d1d829e6aceba61532041d8499dc4ffd8055fbc2 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 8 Jul 2014 12:14:28 +1200 Subject: merge.py --hot to process and generate HOT This adds a --hot flag to merge.py which will assume source templates are in the HOT format, and generate a HOT template artifact. Tests have also been ported to HOT, along with some minor corrections to the existing tests to make the source and result templates valid heat templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: If18ff79f89456123c884a1ab2f910ce4cc9a6e0b --- examples/launchconfig1_hot.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 examples/launchconfig1_hot.yaml (limited to 'examples/launchconfig1_hot.yaml') diff --git a/examples/launchconfig1_hot.yaml b/examples/launchconfig1_hot.yaml new file mode 100644 index 00000000..1354f469 --- /dev/null +++ b/examples/launchconfig1_hot.yaml @@ -0,0 +1,24 @@ +heat_template_version: 2013-05-23 +parameters: + A: + type: string + default: test1 + B: + type: string + default: test2 + resource1Image: + type: string + default: resource1 +resources: + notcomputeConfigBase: + type: AWS::AutoScaling::LaunchConfiguration + metadata: + OpenStack::Role: notcomputeConfig + a: {get_param: A} + b: {get_param: B} + resource1: + type: OS::Nova::Server + properties: + flavor: test_flavor + image: {get_param: resource1Image} + key_name: test_key -- cgit 1.2.3-korg