summaryrefslogtreecommitdiffstats
path: root/merge.py
AgeCommit message (Collapse)AuthorFilesLines
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