summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2022-05-09 15:57:35 -0400
committerGitHub <noreply@github.com>2022-05-09 14:57:35 -0500
commit013be12888720f96281c166323669ed9c95b1a05 (patch)
treedc3e7c75fa5abde8b31494a3f02147c7bc99aa4e
parentb667639c2cd79ccdb3896fc73aa74ba62b4d4fc6 (diff)
downloadansible-013be12888720f96281c166323669ed9c95b1a05.tar.gz
varaiblemanager, more efficienet vars file reads (#77570) (#77595)
(cherry picked from commit 2c2a204dc66e0822003c9f2ea559bb1b2034b7e4)
-rw-r--r--changelogs/fragments/vm_more_efficient.yml2
-rw-r--r--lib/ansible/vars/manager.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/changelogs/fragments/vm_more_efficient.yml b/changelogs/fragments/vm_more_efficient.yml
new file mode 100644
index 0000000000..8cccc2abdd
--- /dev/null
+++ b/changelogs/fragments/vm_more_efficient.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - variablemanager, more efficient read of vars files
diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py
index 518e4595ef..0a1fa87e54 100644
--- a/lib/ansible/vars/manager.py
+++ b/lib/ansible/vars/manager.py
@@ -357,8 +357,7 @@ class VariableManager:
try:
play_search_stack = play.get_search_path()
found_file = real_file = self._loader.path_dwim_relative_stack(play_search_stack, 'vars', vars_file)
- decrypted_file = self._loader.get_real_file(found_file)
- data = preprocess_vars(self._loader.load_from_file(decrypted_file, unsafe=True))
+ data = preprocess_vars(self._loader.load_from_file(found_file, unsafe=True, cache=False))
if data is not None:
for item in data:
all_vars = _combine_and_track(all_vars, item, "play vars_files from '%s'" % vars_file)