Only combine vars in include_vars if both are mappings

Fixes #15184
pull/15176/merge
James Cammarata 9 years ago
parent c09e085480
commit 4fc0aadd84

@ -605,7 +605,7 @@ class VariableManager:
host_name = host.get_name() host_name = host.get_name()
if host_name not in self._vars_cache: if host_name not in self._vars_cache:
self._vars_cache[host_name] = dict() self._vars_cache[host_name] = dict()
if varname in self._vars_cache[host_name]: if varname in self._vars_cache[host_name] and isinstance(self._vars_cache[host_name][varname], MutableMapping) and isinstance(value, MutableMapping):
self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value) self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value)
else: else:
self._vars_cache[host_name][varname] = value self._vars_cache[host_name][varname] = value

Loading…
Cancel
Save