diff options
| author | James Cammarata <jimi@sngx.net> | 2016-03-30 11:10:54 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-03-30 11:15:57 -0400 |
| commit | a432be899efd1ff6e4f7dc313fe1bfd72d4a663d (patch) | |
| tree | 2adde4fc1c402b044119111a8291216310f84074 | |
| parent | d68b463089bc5ca079c9177b1d4ce342ce099d38 (diff) | |
| download | ansible-a432be899efd1ff6e4f7dc313fe1bfd72d4a663d.tar.gz | |
Only combine vars in include_vars if both are mappings
Fixes #15184
| -rw-r--r-- | lib/ansible/vars/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py index 2d1a872f29..26d03f064a 100644 --- a/lib/ansible/vars/__init__.py +++ b/lib/ansible/vars/__init__.py @@ -605,7 +605,7 @@ class VariableManager: host_name = host.get_name() if host_name not in self._vars_cache: 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) else: self._vars_cache[host_name][varname] = value |