aboutsummaryrefslogtreecommitdiffstats
path: root/merge.py
AgeCommit message (Collapse)AuthorFilesLines
2013-12-17Make merge.py installable as a package using pbrmarios1-224/+0
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-16Adds included-template-dir param for resolving template FileIncludesmarios1-9/+11
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
2013-11-29Make merge.py invokable from another scriptmarios1-132/+146
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
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka1-8/+12
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 Byrum1-2/+38
We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
2013-09-13Add support for merging OS::Nova::ServerClint Byrum1-4/+10
Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
2013-08-08Fixed merge code populating properties from yaml.divakar-padiyar-nandavar1-1/+2
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
2013-07-10Add handling of parameter replacements.Clint Byrum1-0/+21
We will need to replace the use of Parameters in the included template with actual values in many cases. Change-Id: I95fc9116dc2bba74c31d5570851c5c4eb476291a
2013-07-10Add FileInclude special type.Clint Byrum1-0/+7
We need to be able to combine pieces without uploading bits to an accessible URL. Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920
2013-07-10Make merge.py output deterministic.Robert Collins1-4/+4
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
2013-06-06Add ability to combine roles into one role.Clint Byrum1-1/+28
2013-06-06Support DependsOnClint Byrum1-0/+3
2013-06-06Replace in AllowedResourcesClint Byrum1-0/+5
2013-06-06Create a utility for merging templates.Clint Byrum1-0/+98