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/source.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'examples/source.yaml')

diff --git a/examples/source.yaml b/examples/source.yaml
index 89707a7b..88f0bde7 100644
--- a/examples/source.yaml
+++ b/examples/source.yaml
@@ -1,7 +1,8 @@
+HeatTemplateFormatVersion: '2012-12-12'
 Parameters:
   SourceImage:
-  Type: String
-  Default: my_image
+    Type: String
+    Default: my_image
 Resources:
   A:
     Type: OS::Nova::Server
-- 
cgit 1.2.3-korg