aboutsummaryrefslogtreecommitdiffstats
path: root/test_merge.bash
AgeCommit message (Collapse)AuthorFilesLines
2014-08-01merge.py --hot to process and generate HOTSteve Baker1-0/+6
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-02-21Add a Merge::Map feature.Robert Collins1-0/+1
We need to scatter gather in a few situations - determining rabbit cluster membership, galera membership and configuring hosts for Nova to permit live migration (which requires host->host communication). This patch is a proof of concept for an eventual heat feature, expressed in merge.py. The example given should work for actual use, but I'll deliver that change separately. Change-Id: I68e9b2471866810cc698ca3ea28ddf5bb1688d7b
2014-01-29Make scaling out a feature for merge.py.Robert Collins1-0/+1
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
2014-01-29Make debugging merge.py in the test suite possible.Robert Collins1-1/+1
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
2013-12-17Make merge.py installable as a package using pbrmarios1-4/+5
Now that merge.py is invokable from another script (Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that review, it makes sense to offer a nicer way to consume the merge functionality. Once you git clone tripleo-heat-templates you can python setup.py install and get /usr/bin/tripleo_heat_merge as well as a tripleo_heat_merge package in python2.7/site-packages. Makefile edits required because we moved merge.py into the tripleo_heat_merge directory for the packaging. Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka1-0/+1
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-10-01Make test_merge.bash executableDerek Higgins1-0/+0
This is an executable script, lets make it so. Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3
2013-09-30Add recursive whole-file __include__ tagClint Byrum1-0/+2
We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
2013-09-25Refactor test_merge.bash for multiple testsClint Byrum1-14/+19
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 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