summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2013-11-18 16:15:17 +0200
committermarios <marios@redhat.com>2013-11-29 15:01:26 +0200
commit18c5998d293523ea16c38fb0c57e3b240463763c (patch)
treec41afee3a21ef46e592cb971251f85bf311779fc /.gitignore
parentb1b60b258706137ce6c28d1bc03f5b19b044f289 (diff)
Make merge.py invokable from another script
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions