aboutsummaryrefslogtreecommitdiffstats
path: root/examples
AgeCommit message (Collapse)AuthorFilesLines
2014-01-29Make scaling out a feature for merge.py.Robert Collins3-0/+286
This is a simple implementation designed to work with our current non-HOT approach. We need to adjust our templates a little to support this - though future work could make that better, it's orthogonal to this effort. Change-Id: I555617e5f24a5882de915f057dc02e008c81e753
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka3-0/+85
This can be very useful for merging of Metadata to be used by optional services (e. g. to add services like tuskar to undercloud on demand). Change-Id: Ifc4016d6e994064c0772c12e668e98bf055fada9
2013-09-30Add recursive whole-file __include__ tagClint Byrum4-0/+44
We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
2013-09-25Refactor test_merge.bash for multiple testsClint Byrum1-2/+4
We will be adding more tests, so make it more of a framework for that. Also fix up minor lib.yaml formatting bug. Change-Id: Ic0fe1679f8d62680dfd0acf215c849aa38b913da
2013-09-19Add functional tests and examples for mergeClint Byrum3-0/+50
merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65