Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
In I587fa7a826f93f89e8e5c266af7f5765438fe738 there is a problem with
the overcloud.yaml Make target. Once the merge.py script is moved from
where the templates are, FileInclude paths cannot be resolved relative
to the script. The included-template-path defaults to './'
Change-Id: I220c5e52d8062e98aa28a1c582e29c7e844bc9ae
|
|
Until now this script has been used at the command line. Tuskar would like
to consume the merge.py functionality to generate the overcloud heat stack
template. A main() is thus added here as well as a few related nits like
ensuring paths are absolute for included files. The actual merge
functionality is split into its own method so it can be invoked more
cleanly from calling scripts. The main method is then used at the command
line as before
For more info about how this will all be used by Tuskar see
I578b4e9f238590ea245b827bc75d252568d194fe
Change-Id: Ia6b6416fe10358d23f2b120283eecaf4c1178cfd
|
|
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
|
|
We can now merge an entire file with minimal effort.
Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
|
|
Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
|
|
Fixed merge code populating properties from yaml files which was
setting only Type attribute for certain attribues related to Image
For example, default value for notcomputeImage is populated properly
in overcloud.yaml
Fixes bug #1202884
Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721
|
|
We will need to replace the use of Parameters in the included template
with actual values in many cases.
Change-Id: I95fc9116dc2bba74c31d5570851c5c4eb476291a
|
|
We need to be able to combine pieces without uploading bits to an
accessible URL.
Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920
|
|
The current code uses dictionary sort order which is defined as being
an undefined order. Since humans review .yaml files having them sorted
is a good thing.
Change-Id: I43a31530bc042750448ac904c0c22f9a59b09b4d
|
|
|
|
|
|
|
|
|