mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Create a Jinja2 environment allowing includes
This commit is contained in:
parent
2cabbd50fc
commit
9f93839d13
2 changed files with 15 additions and 18 deletions
|
@ -586,8 +586,7 @@ class Runner(object):
|
||||||
|
|
||||||
# template the source data locally
|
# template the source data locally
|
||||||
try:
|
try:
|
||||||
resultant = utils.template_from_file(utils.path_dwim(self.basedir, source),
|
resultant = utils.template_from_file(self.basedir, source, inject, self.setup_cache)
|
||||||
inject, self.setup_cache, no_engine=False)
|
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
result = dict(failed=True, msg=str(e))
|
result = dict(failed=True, msg=str(e))
|
||||||
return ReturnData(host=conn.host, comm_ok=False, result=result)
|
return ReturnData(host=conn.host, comm_ok=False, result=result)
|
||||||
|
|
|
@ -265,35 +265,33 @@ def varReplace(raw, vars):
|
||||||
|
|
||||||
return ''.join(done)
|
return ''.join(done)
|
||||||
|
|
||||||
def _template(text, vars, setup_cache=None, no_engine=True):
|
def _template(text, vars, setup_cache=None):
|
||||||
''' run a text buffer through the templating engine '''
|
''' run a text buffer through the templating engine '''
|
||||||
vars = vars.copy()
|
vars = vars.copy()
|
||||||
vars['hostvars'] = setup_cache
|
vars['hostvars'] = setup_cache
|
||||||
text = varReplace(unicode(text), vars)
|
text = varReplace(unicode(text), vars)
|
||||||
if no_engine:
|
|
||||||
# used when processing include: directives so that Jinja is evaluated
|
|
||||||
# in a later context when more variables are available
|
|
||||||
return text
|
return text
|
||||||
else:
|
|
||||||
template = jinja2.Template(text)
|
|
||||||
res = template.render(vars)
|
|
||||||
if text.endswith('\n') and not res.endswith('\n'):
|
|
||||||
res = res + '\n'
|
|
||||||
return res
|
|
||||||
|
|
||||||
def template(text, vars, setup_cache=None, no_engine=True):
|
def template(text, vars, setup_cache=None):
|
||||||
''' run a text buffer through the templating engine
|
''' run a text buffer through the templating engine
|
||||||
until it no longer changes '''
|
until it no longer changes '''
|
||||||
prev_text = ''
|
prev_text = ''
|
||||||
while prev_text != text:
|
while prev_text != text:
|
||||||
prev_text = text
|
prev_text = text
|
||||||
text = _template(text, vars, setup_cache, no_engine)
|
text = _template(text, vars, setup_cache)
|
||||||
return text
|
return text
|
||||||
|
|
||||||
def template_from_file(path, vars, setup_cache, no_engine=True):
|
def template_from_file(basedir, path, vars, setup_cache):
|
||||||
''' run a file through the templating engine '''
|
''' run a file through the templating engine '''
|
||||||
data = codecs.open(path, encoding="utf8").read()
|
environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=False)
|
||||||
return template(data, vars, setup_cache, no_engine=no_engine)
|
data = codecs.open(path_dwim(basedir, path), encoding="utf8").read()
|
||||||
|
template = environment.from_string(data)
|
||||||
|
vars = vars.copy()
|
||||||
|
vars['hostvars'] = setup_cache
|
||||||
|
res = template.render(vars)
|
||||||
|
if data.endswith('\n') and not res.endswith('\n'):
|
||||||
|
res = res + '\n'
|
||||||
|
return res
|
||||||
|
|
||||||
def parse_yaml(data):
|
def parse_yaml(data):
|
||||||
return yaml.load(data)
|
return yaml.load(data)
|
||||||
|
|
Loading…
Reference in a new issue