Allow exclusion of hosts/groups

This commit is contained in:
Daniel Hokka Zakrisson 2012-06-15 11:01:30 +02:00
parent 0fb59f0bdd
commit 42aecd33f8

View file

@ -85,15 +85,22 @@ class Inventory(object):
patterns = pattern.replace(";",":").split(":") patterns = pattern.replace(";",":").split(":")
groups = self.get_groups() groups = self.get_groups()
for group in groups: for pat in patterns:
for host in group.get_hosts(): if pat.startswith("!"):
for pat in patterns: pat = pat[1:]
if group.name == pat or pat == 'all' or self._match(host.name, pat): inverted = True
#must test explicitly for None because [] means no hosts allowed else:
if self._restriction==None: inverted = False
hosts[host.name] = host for group in groups:
elif host.name in self._restriction: for host in group.get_hosts():
hosts[host.name] = host if group.name == pat or pat == 'all' or self._match(host.name, pat):
#must test explicitly for None because [] means no hosts allowed
if self._restriction==None or host.name in self._restriction:
if inverted:
if host.name in hosts:
del hosts[host.name]
else:
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):