aboutsummaryrefslogtreecommitdiffstats
path: root/examples/source_lib_result.yaml
AgeCommit message (Collapse)AuthorFilesLines
2014-08-01merge.py --hot to process and generate HOTSteve Baker1-3/+3
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
2014-01-31Remove image parameter changing from mergeClint Byrum1-2/+2
The merge tool originally was meant to merge somewhat different things, and thus this was helpful in the early versions. However, at this point we want parameters to be more stable and we don't generally merge things that have their own image parameter. Meanwhile this feature caused problems as we change resource names. This is a backward incompatible change of default behavior, but the old behavior can be had again by passing --change-image-params. Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d
2013-09-19Add functional tests and examples for mergeClint Byrum1-0/+24
merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65