Commit 893bf906 by Michael DeHaan

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

This reverts commit f41fb90d.
parent a54d9f66
......@@ -73,14 +73,14 @@ class Inventory(object):
hosts = {}
patterns = pattern.replace(";",":").split(":")
for (groupname, group) in self.get_groups().items():
for host in group.get_hosts():
for pat in patterns:
if group.name == pat or pat == 'all' or self._match(host.name, pat):
if not self._restriction:
hosts[host.name] = host
if self._restriction and host.name in self._restriction:
hosts[host.name] = host
for group in self.get_groups():
for host in group.get_hosts():
for pat in patterns:
if group.name == pat or pat == 'all' or self._match(host.name, pat):
if not self._restriction:
hosts[host.name] = host
if self._restriction and host.name in self._restriction:
hosts[host.name] = host
return sorted(hosts.values(), key=lambda x: x.name)
def get_groups(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment