Merge pull request #14450 from bcoca/include_vars_merge

Include vars merge
8 years ago · 413abcf16d
parent 3e407ed743 a327420b67
commit 413abcf16d
1 changed files with 4 additions and 2 deletions
--- a/lib/ansible/vars/init.py
+++ b/lib/ansible/vars/init.py
@ -600,8 +600,10 @@ class VariableManager:
        '''
        Sets a value in the vars_cache for a host.
        '''
-
        host_name = host.get_name()
        if host_name not in self._vars_cache:
            self._vars_cache[host_name] = dict()
-        self._vars_cache[host_name][varname] = value
+        if varname in self._vars_cache[host_name]:
+            self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value)
+        else:
+            self._vars_cache[host_name][varname] = value