host.get_variables includes too many variables, use host.vars instead

Not quite as attractive, but allows variable precedence and lazy
resolution to work as intended, rather than resolving them on a
per-inventory basis.
This commit is contained in:
Daniel Hokka Zakrisson 2013-03-02 10:26:26 +01:00
parent 8f917a5a9f
commit 2ff2f05a0f

View file

@ -59,7 +59,7 @@ class InventoryDirectory(object):
for host in group.get_hosts(): for host in group.get_hosts():
if host.name not in self.hosts: if host.name not in self.hosts:
self.hosts[host.name] = Host(host.name) self.hosts[host.name] = Host(host.name)
for k, v in host.get_variables().iteritems(): for k, v in host.vars.iteritems():
self.hosts[host.name].set_variable(k, v) self.hosts[host.name].set_variable(k, v)
self.groups[name].add_host(self.hosts[host.name]) self.groups[name].add_host(self.hosts[host.name])
# This needs to be a second loop to ensure all the parent groups exist # This needs to be a second loop to ensure all the parent groups exist