fix the get_hosts() error in get_groups returning a dict not a list of group objects

pull/329/head
Seth Vidal 13 years ago
parent d6e56dee87
commit f41fb90d78

@ -73,14 +73,14 @@ class Inventory(object):
hosts = {} hosts = {}
patterns = pattern.replace(";",":").split(":") patterns = pattern.replace(";",":").split(":")
for group in self.get_groups(): for (groupname, group) in self.get_groups().items():
for host in group.get_hosts(): for host in group.get_hosts():
for pat in patterns: for pat in patterns:
if group.name == pat or pat == 'all' or self._match(host.name, pat): if group.name == pat or pat == 'all' or self._match(host.name, pat):
if not self._restriction: if not self._restriction:
hosts[host.name] = host hosts[host.name] = host
if self._restriction and host.name in self._restriction: if self._restriction and host.name in self._restriction:
hosts[host.name] = host hosts[host.name] = host
return sorted(hosts.values(), key=lambda x: x.name) return sorted(hosts.values(), key=lambda x: x.name)
def get_groups(self): def get_groups(self):

Loading…
Cancel
Save