summaryrefslogtreecommitdiffstats
path: root/.gitignore
AgeCommit message (Collapse)AuthorFilesLines
2013-12-17Make merge.py installable as a package using pbrmarios1-0/+4
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-11-25Use merge.py for the undercloud templates.Dan Prince1-0/+4
This will require some changes to our devtest scripts and TOCI to ensure we build the overcloud-vm template before attempting to use it. Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
2013-09-19Add functional tests and examples for mergeClint Byrum1-0/+2
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-08-12Ignore built files.Robert Collins1-0/+3
We don't want someone accidentally committing them. Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101
2013-06-27Ignore editor files.Robert Collins1-0/+3
Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526
2013-02-26Initial commitJoshua McKenty1-0/+35