aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
AgeCommit message (Collapse)AuthorFilesLines
2014-08-04Port all templates to HOTSteve Baker1-1/+1
This change was generated and validated by running the following: make hot clean all validate-all This converts all templates to be valid HOT. Fn::Select is not converted in this change but this will actually work with heat_template_version 2013-05-23. Fn::Select is converted manually in the next change in this series. This change also sets the heat_template_version to 2014-10-16 which includes the list_join intrinsic functions used throughout these templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
2014-08-01merge.py --hot to process and generate HOTSteve Baker1-0/+27
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-07-18merge.py use a class to represent template syntaxSteve Baker1-52/+73
Defining cfn template syntax as class attributes will make it easier to port merge.py to HOT just by setting lang to a different class. Change-Id: I2547333d727bf91cd3159790f0f20f4d10195a9c Partial-Blueprint: tripleo-juno-remove-mergepy
2014-04-16Switch overcloud to software-configClint Byrum1-1/+7
This migrates the overcloud to using OS::Heat::StructuredConfig and OS::Heat::StructuredDeployment. With those tools, we can decouple servers from software configuration and begin to deprecate features in tripleo_heat_merge. Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
2014-03-06Fix Merge::Map for scatter-gather in Configs.Robert Collins1-1/+6
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 Collins1-0/+22
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-31Remove image parameter changing from mergeClint Byrum1-11/+19
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 Collins1-2/+104
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-29Permit writing output to other than stdout.Robert Collins1-1/+8
Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01
2013-12-17Make merge.py installable as a package using pbrmarios1-0/+224
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