cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
This reverts commit f41fb90d78.
This commit is contained in:
Michael DeHaan 2012-05-07 21:46:36 -04:00
parent 121d7c4ece
commit e1914a0e62
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/inventory.py
View file

@ -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):