diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-01 23:47:31 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-03-02 06:56:38 +0000 |
commit | 8062b4ad7f61c25ddf7c3f0d91335156430d3090 (patch) | |
tree | 447fcd6cea94984b9f5e3cd75d6fd1547c1e8f74 /scripts | |
parent | 77fb5c689a634b19f5e2a3e2b992c13587bb4aea (diff) |
Update git submodules
* Update docs/submodules/pharos from branch 'master'
- generate_config: New `-i` arg for j2 includes dir
jinja2 does not support imports from parent directories, so in order
for j2 to be able to use '{% from <some>.j2 import ... %}' constructs
with included j2 residing on a separate dirpath than current j2, add
support for explicitly adding directories to the templater search
path.
This also allows calling generate_config with only file basename as
'-j' arg value, as long as the dirname is passed via '-i' (can be
extended later to parsing multiple j2 files at once).
Change-Id: I943fda9262a6f7de5ee6fcc3e7bc9828c339651a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
- generate_config: Enable 'do' j2 extension
'do' is useful to avoid hacks like {% set _ = x.update(...) %}.
Instead: {% do x.update(...) %}.
[1] http://jinja.pocoo.org/docs/2.10/extensions/
Change-Id: I886beb97e0383ba11b81aa21cf12b11ebc4b05b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions