aboutsummaryrefslogtreecommitdiffstats
path: root/examples
AgeCommit message (Collapse)AuthorFilesLines
2014-03-06Fix Merge::Map for scatter-gather in Configs.Robert Collins1-0/+132
When Merge::Map was used like so: NovaCompute0Config: Merge::Map: NovaCompute0: Fn:.... We were adjusting the inner NovaCompute0 to the current scaling loop position rather than exploding it out as part of the map. For now, we want maps to be global in context so the fix is fortunately simple. Change-Id: Ibea723d4c763f593d934a9d2acfd31ce369f6408
2014-02-21Add a Merge::Map feature.Robert Collins3-0/+344
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-02-21Fix tests.Robert Collins1-0/+3
We're not gating yet - this skew crept in. Change-Id: I97b064f6d0cb75bf80b423951101687b6d26d90c
2014-02-17Add username parameter for rabbitRichard Su2-0/+4
Username is currently assumed to be guest in the configuration files. This change makes it more explicit. Configuration files in tripleo-image-elements will be updated to use this parameter in an upcoming patch. Change-Id: Ia176f4d573a3a293560c72236a4181befa678301
2014-01-31Remove image parameter changing from mergeClint Byrum3-6/+6
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
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