Adds included-template-dir param for resolving template FileIncludes
authormarios <marios@redhat.com>
Fri, 13 Dec 2013 12:20:49 +0000 (14:20 +0200)
committermarios <marios@redhat.com>
Mon, 16 Dec 2013 15:02:48 +0000 (17:02 +0200)
commit3697a4ef029c1f896afbdcf1039d1aeb3761c8b2
treecd870ff1bc94cf92d5e34ed74863468a2744de51
parent18c5998d293523ea16c38fb0c57e3b240463763c
Adds included-template-dir param for resolving template FileIncludes

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
merge.py