From e51e36ea6a98773e3df2526e6b84a4e6ad3057e8 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 21 Apr 2022 17:52:53 -0400 Subject: [PATCH] varaiblemanager, more efficienet vars file reads (#77570) (#77596) (cherry picked from commit 2c2a204dc66e0822003c9f2ea559bb1b2034b7e4) --- changelogs/fragments/vm_more_efficient.yml | 2 ++ lib/ansible/vars/manager.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/vm_more_efficient.yml diff --git a/changelogs/fragments/vm_more_efficient.yml b/changelogs/fragments/vm_more_efficient.yml new file mode 100644 index 00000000000..8cccc2abdd7 --- /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 e3630d74f31..9ca30daf675 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -353,8 +353,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)