a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5308 from zecrazytux/fix/hash_merge_dynamic_inventory 

Let merge hash_bahaviour work with dynamic inventory
pull/4420/head
jctanner 2014-01-14 07:58:25 -08:00
parent 17c50cc81e c8d5846ab9
commit a6bc63512e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/inventory/__init__.py
View File

@ -348,7 +348,7 @@ class Inventory(object):
vars.update(host.get_variables()) vars.update(host.get_variables())
if self.parser is not None: if self.parser is not None:
vars.update(self.parser.get_host_variables(host)) vars = utils.combine_vars(vars, self.parser.get_host_variables(host))
return vars return vars
def add_group(self, group): def add_group(self, group):