summaryrefslogtreecommitdiff
path: root/lib/ansible
diff options
context:
space:
mode:
authorMartin Krizek <martin.krizek@gmail.com>2021-08-05 09:59:54 +0200
committerGitHub <noreply@github.com>2021-08-05 09:59:54 +0200
commit5a3807656860cc52c7e6b3eebc5c9397585525ba (patch)
tree5e4095f69581fe94c077552ecbfc49fc0dcf250c /lib/ansible
parent1b95b1e7a43ac7c779ba730649922af917b387db (diff)
downloadansible-5a3807656860cc52c7e6b3eebc5c9397585525ba.tar.gz
Globals should be accessible when importing a template without the context (#75384)
Fixes #75371
Diffstat (limited to 'lib/ansible')
-rw-r--r--lib/ansible/template/template.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py
index 5a555883a0..3e7738bf7d 100644
--- a/lib/ansible/template/template.py
+++ b/lib/ansible/template/template.py
@@ -33,11 +33,13 @@ class AnsibleJ2Template(jinja2.environment.Template):
'''
def new_context(self, vars=None, shared=False, locals=None):
- if vars is not None:
- if isinstance(vars, dict):
- vars = vars.copy()
- if locals is not None:
- vars.update(locals)
- else:
- vars = vars.add_locals(locals)
+ if vars is None:
+ vars = dict(self.globals or ())
+
+ if isinstance(vars, dict):
+ vars = vars.copy()
+ if locals is not None:
+ vars.update(locals)
+ else:
+ vars = vars.add_locals(locals)
return self.environment.context_class(self.environment, vars, self.name, self.blocks)