Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01
|
|
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
|