Code Review / apex-tripleo-heat-templates.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 998c5dd) | patch
merge.py --hot to process and generate HOT
authorSteve Baker <sbaker@redhat.com>
Tue, 8 Jul 2014 00:14:28 +0000 (12:14 +1200)
committerSteve Baker <sbaker@redhat.com>
Thu, 31 Jul 2014 22:49:59 +0000 (10:49 +1200)
commitd1d829e6aceba61532041d8499dc4ffd8055fbc2
tree17cc9b01eaca65d8c85df9f9acea2f4d3c54bf3ftree | snapshot
parent998c5dda9c6d3ddf0f654c71d4c172b7b6dd3e59commit | 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
25 files changed:
examples/launchconfig1.yaml diff | blob | history
examples/launchconfig1_hot.yaml [new file with mode: 0644] blob
examples/launchconfig2.yaml diff | blob | history
examples/launchconfig2_hot.yaml [new file with mode: 0644] blob
examples/launchconfig_result_hot.yaml [new file with mode: 0644] blob
examples/lib_hot.yaml [new file with mode: 0644] blob
examples/scale1.yaml diff | blob | history
examples/scale1_hot.yaml [new file with mode: 0644] blob
examples/scale2_hot.yaml [new file with mode: 0644] blob
examples/scale_map.yaml diff | blob | history
examples/scale_map2_hot.yaml [new file with mode: 0644] blob
examples/scale_map_hot.yaml [new file with mode: 0644] blob
examples/scale_map_result_hot.yaml [new file with mode: 0644] blob
examples/scale_result_hot.yaml [new file with mode: 0644] blob
examples/source.yaml diff | blob | history
examples/source2_hot.yaml [new file with mode: 0644] blob
examples/source2_lib_result_hot.yaml [new file with mode: 0644] blob
examples/source_hot.yaml [new file with mode: 0644] blob
examples/source_include_subkey.yaml diff | blob | history
examples/source_include_subkey_hot.yaml [new file with mode: 0644] blob
examples/source_include_subkey_result_hot.yaml [new file with mode: 0644] blob
examples/source_lib_result.yaml diff | blob | history
examples/source_lib_result_hot.yaml [new file with mode: 0644] blob
test_merge.bash diff | blob | history
tripleo_heat_merge/merge.py diff | blob | history