cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use static vars when computing host vars known to be static (inventory_hostname, inventory_dir etc.).

Browse source
This commit is contained in:
Yannig Perre 2015-11-04 22:16:14 +01:00
parent e0aa3ff232
commit ccbdd6229a
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/template/__init__.py
View file

@ -268,7 +268,7 @@ class Templar:
# Clearing cache # Clearing cache
self._cached_result = {} self._cached_result = {}
def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True): def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True, static_vars = ['']):
''' '''
Templates (possibly recursively) any given data as input. If convert_bare is Templates (possibly recursively) any given data as input. If convert_bare is
set to True, the given data will be wrapped as a jinja2 variable ('{{foo}}') set to True, the given data will be wrapped as a jinja2 variable ('{{foo}}')
@ -340,7 +340,10 @@ class Templar:
# we don't use iteritems() here to avoid problems if the underlying dict # we don't use iteritems() here to avoid problems if the underlying dict
# changes sizes due to the templating, which can happen with hostvars # changes sizes due to the templating, which can happen with hostvars
for k in variable.keys(): for k in variable.keys():
d[k] = self.template(variable[k], preserve_trailing_newlines=preserve_trailing_newlines, fail_on_undefined=fail_on_undefined, overrides=overrides) if k not in static_vars:
d[k] = self.template(variable[k], preserve_trailing_newlines=preserve_trailing_newlines, fail_on_undefined=fail_on_undefined, overrides=overrides)
else:
d[k] = variable[k]
return d return d
else: else:
return variable return variable

9
lib/ansible/vars/hostvars.py
View file

@ -28,6 +28,13 @@ from ansible import constants as C
from ansible.inventory.host import Host from ansible.inventory.host import Host
from ansible.template import Templar from ansible.template import Templar
STATIC_VARS = [
'inventory_hostname', 'inventory_hostname_short',
'inventory_file', 'inventory_dir', 'playbook_dir',
'ansible_play_hosts', 'play_hosts', 'groups', 'ungrouped', 'group_names',
'ansible_version', 'omit', 'role_names'
]
try: try:
from hashlib import sha1 from hashlib import sha1
except ImportError: except ImportError:
@ -81,7 +88,7 @@ class HostVars(collections.Mapping):
result = self._cached_result[sha1_hash] result = self._cached_result[sha1_hash]
else: else:
templar = Templar(variables=data, loader=self._loader) templar = Templar(variables=data, loader=self._loader)
result = templar.template(data, fail_on_undefined=False) result = templar.template(data, fail_on_undefined=False, static_vars=STATIC_VARS)
self._cached_result[sha1_hash] = result self._cached_result[sha1_hash] = result
return result return result