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

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

View file

@ -55,7 +55,7 @@ from ansible.parsing.yaml.dumper import AnsibleDumper
from ansible.utils.hashing import md5s, checksum_s
from ansible.utils.unicode import unicode_wrap
from ansible.utils.vars import merge_hash
from ansible.vars.hostvars import HostVars
from ansible.vars.hostvars import HostVars, HostVarsVars
UUID_NAMESPACE_ANSIBLE = uuid.UUID('361E6D51-FAEC-444A-9079-341386DA8E2E')
@ -67,7 +67,7 @@ class AnsibleJSONEncoder(json.JSONEncoder):
types like HostVars
'''
def default(self, o):
if isinstance(o, HostVars):
if isinstance(o, (HostVars, HostVarsVars)):
return dict(o)
elif isinstance(o, (datetime.date, datetime.datetime)):
return o.isoformat()