Merge pull request #5308 from zecrazytux/fix/hash_merge_dynamic_inventory

Let merge hash_bahaviour work with dynamic inventory
This commit is contained in:
jctanner 2014-01-14 07:58:25 -08:00
commit a6bc63512e

View file

@ -348,7 +348,7 @@ class Inventory(object):
vars.update(host.get_variables())
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
def add_group(self, group):