summaryrefslogtreecommitdiff
path: root/lib/ansible/vars/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/vars/__init__.py')
-rw-r--r--lib/ansible/vars/__init__.py2
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