diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-07-08 12:14:28 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-01 10:49:59 +1200 |
| commit | d1d829e6aceba61532041d8499dc4ffd8055fbc2 (patch) | |
| tree | 17cc9b01eaca65d8c85df9f9acea2f4d3c54bf3f /examples/source_lib_result.yaml | |
| parent | 998c5dda9c6d3ddf0f654c71d4c172b7b6dd3e59 (diff) | |
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
Diffstat (limited to 'examples/source_lib_result.yaml')
| -rw-r--r-- | examples/source_lib_result.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/source_lib_result.yaml b/examples/source_lib_result.yaml index ceb8a321..5844c813 100644 --- a/examples/source_lib_result.yaml +++ b/examples/source_lib_result.yaml @@ -1,9 +1,9 @@ Description: examples/source.yaml HeatTemplateFormatVersion: '2012-12-12' Parameters: - Default: my_image - SourceImage: null - Type: String + SourceImage: + Default: my_image + Type: String Resources: A: Properties: |