1. ansible
  2. Commit a432be899efd1ff6e4f7dc313fe1bfd72d4a663d
Browse code

Only combine vars in include_vars if both are mappings

Fixes #15184

James Cammarata authored on 2016/03/31 00:10:54
Showing 1 changed files
lib/ansible/vars/__init__.py
History View file @ a432be8
... ... 
@@ -605,7 +605,7 @@ class VariableManager:
605 605 
         host_name = host.get_name()
606 606 
         if host_name not in self._vars_cache:
607 607 
             self._vars_cache[host_name] = dict()
608 
-        if varname in self._vars_cache[host_name]:
608 
+        if varname in self._vars_cache[host_name] and isinstance(self._vars_cache[host_name][varname], MutableMapping) and isinstance(value, MutableMapping):
609 609 
             self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value)
610 610 
         else:
611 611 
             self._vars_cache[host_name][varname] = value