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

simplified pattern matching, fixed ungrouped (#22523)

Browse source 
* simplified pattern matching, fixed ungrouped

ungrouped was ignored for patterns, now it is usable again

* even simpler

(cherry picked from commit 273786d0bd)
This commit is contained in:
Brian Coca 2017-03-15 14:25:46 -04:00 committed by Brian Coca
parent c9ea993c88
commit eccfcf020c
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/ansible/inventory/__init__.py
View file

@ -473,30 +473,21 @@ class Inventory(object):
""" """
results = [] results = []
hostnames = set()
def __append_host_to_results(host): def __append_host_to_results(host):
if host.name not in hostnames: if host.name not in results:
hostnames.add(host.name) if not host.implicit:
results.append(host) results.append(host)
groups = self.get_groups() groups = self.get_groups()
for group in groups.values(): for group in groups.values():
if pattern == 'all': if self._match(group.name, pattern):
for host in group.get_hosts(): for host in group.get_hosts():
if host.implicit:
continue
__append_host_to_results(host) __append_host_to_results(host)
else: else:
if self._match(group.name, pattern) and group.name not in ('all', 'ungrouped'): matching_hosts = self._match_list(group.get_hosts(), 'name', pattern)
for host in group.get_hosts(): for host in matching_hosts:
if host.implicit: __append_host_to_results(host)
continue
__append_host_to_results(host)
else:
matching_hosts = self._match_list(group.get_hosts(), 'name', pattern)
for host in matching_hosts:
__append_host_to_results(host)
if pattern in C.LOCALHOST and len(results) == 0: if pattern in C.LOCALHOST and len(results) == 0:
new_host = self._create_implicit_localhost(pattern) new_host = self._create_implicit_localhost(pattern)