cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

relative paths for (include/extends) in jinja2 templates

Browse source
This commit is contained in:
Stijn Opheide 2012-10-08 08:56:57 +02:00
parent c8854a23ea
commit 4a6b5c5de2
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -14,3 +14,6 @@ rpm-build
.idea .idea
# Mac OS X stuff # Mac OS X stuff
.DS_Store .DS_Store
# Sublime stuff
*.sublime-project
*.sublime-workspace

3
lib/ansible/utils.py
View file

@ -392,7 +392,8 @@ def template_from_file(basedir, path, vars):
''' run a file through the templating engine ''' ''' run a file through the templating engine '''
realpath = path_dwim(basedir, path) realpath = path_dwim(basedir, path)
environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=True) loader=jinja2.FileSystemLoader([basedir,os.path.dirname(realpath)])
environment = jinja2.Environment(loader=loader, trim_blocks=True)
environment.filters['to_json'] = json.dumps environment.filters['to_json'] = json.dumps
environment.filters['from_json'] = json.loads environment.filters['from_json'] = json.loads
environment.filters['to_yaml'] = yaml.dump environment.filters['to_yaml'] = yaml.dump