diff options
author | James Cammarata <jimi@sngx.net> | 2016-09-21 10:34:57 -0500 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2016-09-21 12:50:17 -0500 |
commit | ac5ddf4aa092e12f9e1c85c6b74aa30b7ef0a382 (patch) | |
tree | 2b35dd256de4977583f6e5c766aa7f4d6c3dbbec | |
parent | e131ab83c8f4d1153b0b96da907f2549f86a209f (diff) | |
download | ansible-issue_17024_greedy_lookups.tar.gz |
Create a raw lookup for hostvars that does not template the dataissue_17024_greedy_lookups
When using hostvars to get extra connection-specific vars for connection
plugins, use this raw lookup to avoid prematurely templating all of the
hostvar data (triggering unnecessary lookups).
Fixes #17024
-rw-r--r-- | lib/ansible/executor/task_executor.py | 12 | ||||
-rw-r--r-- | lib/ansible/vars/hostvars.py | 15 |
2 files changed, 21 insertions, 6 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 159cebdbf1..14db3114de 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -437,7 +437,17 @@ class TaskExecutor: # get the connection and the handler for this execution if not self._connection or not getattr(self._connection, 'connected', False) or self._play_context.remote_addr != self._connection._play_context.remote_addr: self._connection = self._get_connection(variables=variables, templar=templar) - self._connection.set_host_overrides(host=self._host, hostvars=variables.get('hostvars', {}).get(self._host.name, {})) + hostvars = variables.get('hostvars', None) + if hostvars: + try: + target_hostvars = hostvars.raw_get(self._host.name) + except: + # FIXME: this should catch the j2undefined error here + # specifically instead of all exceptions + target_hostvars = dict() + else: + target_hostvars = dict() + self._connection.set_host_overrides(host=self._host, hostvars=target_hostvars) else: # if connection is reused, its _play_context is no longer valid and needs # to be replaced with the one templated above, in case other data changed diff --git a/lib/ansible/vars/hostvars.py b/lib/ansible/vars/hostvars.py index 49bdd3968c..31d30ad801 100644 --- a/lib/ansible/vars/hostvars.py +++ b/lib/ansible/vars/hostvars.py @@ -68,20 +68,25 @@ class HostVars(collections.Mapping): host = self._inventory.get_host(host_name) return host - def __getitem__(self, host_name): + def raw_get(self, host_name): + ''' + Similar to __getitem__, however the returned data is not run through + the templating engine to expand variables in the hostvars. + ''' host = self._find_host(host_name) if host is None: raise j2undefined - data = self._variable_manager.get_vars(loader=self._loader, host=host, include_hostvars=False) + return self._variable_manager.get_vars(loader=self._loader, host=host, include_hostvars=False) + def __getitem__(self, host_name): + data = self.raw_get(host_name) sha1_hash = sha1(str(data).encode('utf-8')).hexdigest() if sha1_hash in self._cached_result: result = self._cached_result[sha1_hash] else: - #templar = Templar(variables=data, loader=self._loader) - #result = templar.template(data, fail_on_undefined=False, static_vars=STATIC_VARS) - result = data + templar = Templar(variables=data, loader=self._loader) + result = templar.template(data, fail_on_undefined=False, static_vars=STATIC_VARS) self._cached_result[sha1_hash] = result return result |