internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only template each hostvars var on-demand (fixes #33259)

Browse Source
This commit is contained in:
Andrew Gaffney
2018-02-08 10:17:28 -07:00
committed by Brian Coca
parent 0f893027c4
commit dae737c8b7
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/template/__init__.py
View File

@@ -27,7 +27,7 @@ import pwd
import re
import time
from collections import Sequence
from collections import Sequence, Mapping
from functools import wraps
from io import StringIO
from numbers import Number
@@ -356,7 +356,7 @@ class Templar:
clean_list.append(self._clean_data(list_item))
ret = clean_list
elif isinstance(orig_data, dict):
elif isinstance(orig_data, (dict, Mapping)):
clean_dict = {}
for k in orig_data:
clean_dict[self._clean_data(k)] = self._clean_data(orig_data[k])
@@ -509,7 +509,7 @@ class Templar:
overrides=overrides,
disable_lookups=disable_lookups,
) for v in variable]
elif isinstance(variable, dict):
elif isinstance(variable, (dict, Mapping)):
d = {}
# we don't use iteritems() here to avoid problems if the underlying dict
# changes sizes due to the templating, which can happen with hostvars