11 Commits

Author SHA1 Message Date
Robert Collins
3e35d53061 Make removing nodes from scaled items possible.
This makes it possible to remove a dead node (e.g. if NovaCompute2 has
failed, regenerate the template with ,2 in the scale parameter, and
NovaCompute2 will not be enumerated.

Change-Id: I65d85a88152ed4adee60895173f8a05611a6440b
2014-08-12 15:33:01 +12:00
Steve Baker
d1d829e6ac merge.py --hot to process and generate HOT
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-08-01 10:49:59 +12:00
Robert Collins
70494ab2cb Add a Merge::Map feature.
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-21 11:13:10 +13:00
Robert Collins
c071255ad6 Make scaling out a feature for merge.py.
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-29 01:39:27 +13:00
Robert Collins
23c8aac2ba Make debugging merge.py in the test suite possible.
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
2014-01-29 01:39:27 +13:00
marios
c9ce27c981 Make merge.py installable as a package using pbr
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-12-17 15:53:08 +02:00
Roman Podolyaka
fcbead3871 Make LaunchConfiguration resources mergeable
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-14 15:30:24 +03:00
Derek Higgins
0326335160 Make test_merge.bash executable
This is an executable script, lets make it so.

Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3
2013-10-01 09:30:37 +01:00
Clint Byrum
69f1dcc7cb Add recursive whole-file __include__ tag
We can now merge an entire file with minimal effort.

Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
2013-09-30 09:04:07 -07:00
Clint Byrum
cd3ddc482f Refactor test_merge.bash for multiple tests
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-25 11:24:06 -07:00
Clint Byrum
0dbf2810a0 Add functional tests and examples for merge
merge.py is undocumented and untested, which is undesirable, as it does
not seem to be going away any time soon.

Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
2013-09-19 13:02:03 -07:00