From 180159b01da925e46440b48bc62f750fc555bee8 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 17 Nov 2015 14:44:46 -0500 Subject: [PATCH] Adding vars back in and trying to add a little more speed by avoiding copies --- lib/ansible/vars/__init__.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py index ea9c38e0b9..aed29150e6 100644 --- a/lib/ansible/vars/__init__.py +++ b/lib/ansible/vars/__init__.py @@ -101,13 +101,14 @@ class VariableManager: def __getstate__(self): data = dict( - fact_cache = self._fact_cache.copy(), - np_fact_cache = self._nonpersistent_fact_cache.copy(), - vars_cache = self._vars_cache.copy(), - extra_vars = self._extra_vars.copy(), - host_vars_files = self._host_vars_files.copy(), - group_vars_files = self._group_vars_files.copy(), + fact_cache = self._fact_cache, + np_fact_cache = self._nonpersistent_fact_cache, + vars_cache = self._vars_cache, + extra_vars = self._extra_vars, + host_vars_files = self._host_vars_files, + group_vars_files = self._group_vars_files, omit_token = self._omit_token, + #inventory = self._inventory, ) return data @@ -258,6 +259,8 @@ class VariableManager: except KeyError: pass + all_vars['vars'] = all_vars.copy() + if play: all_vars = combine_vars(all_vars, play.get_vars())