From d1d829e6aceba61532041d8499dc4ffd8055fbc2 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
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/launchconfig_result_hot.yaml | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 examples/launchconfig_result_hot.yaml

(limited to 'examples/launchconfig_result_hot.yaml')

diff --git a/examples/launchconfig_result_hot.yaml b/examples/launchconfig_result_hot.yaml
new file mode 100644
index 00000000..e3019f20
--- /dev/null
+++ b/examples/launchconfig_result_hot.yaml
@@ -0,0 +1,43 @@
+description: examples/launchconfig1_hot.yaml,examples/launchconfig2_hot.yaml
+heat_template_version: '2013-05-23'
+parameters:
+  A:
+    default: test1
+    type: string
+  B:
+    default: test2
+    type: string
+  C:
+    default: test3
+    type: string
+  resource1Image:
+    default: resource1
+    type: string
+  resource2Image:
+    default: resource2
+    type: string
+resources:
+  notcomputeConfig:
+    metadata:
+      OpenStack::Role: notcomputeConfig
+      a:
+        get_param: A
+      b:
+        get_param: B
+      c:
+        get_param: C
+    type: AWS::AutoScaling::LaunchConfiguration
+  resource1:
+    properties:
+      flavor: test_flavor
+      image:
+        get_param: resource1Image
+      key_name: test_key
+    type: OS::Nova::Server
+  resource2:
+    properties:
+      flavor: test_flavor
+      image:
+        get_param: resource2Image
+      key_name: test_key
+    type: OS::Nova::Server
-- 
cgit 1.2.3-korg