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

restore hostpattern regex/glob behaviour

Browse source 
they are back to matching both groups and hosts when they are a glob/regex

fixes #32906
This commit is contained in:
Brian Coca 2017-11-21 14:36:05 -05:00 committed by Brian Coca
parent e4300e8d54
commit e50f931cf3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/inventory/manager.py
View file

@ -99,7 +99,7 @@ def split_host_pattern(pattern):
try:
(base, port) = parse_address(pattern, allow_ranges=True)
patterns = [pattern]
except:
except Exception:
# The only other case we accept is a ':'-separated list of patterns.
# This mishandles IPv6 addresses, and is retained only for backwards
# compatibility.
@ -526,7 +526,9 @@ class InventoryManager(object):
if matching_groups:
for groupname in matching_groups:
results.extend(self._inventory.groups[groupname].get_hosts())
else:
# check hosts if no groups matched or it is a regex/glob pattern
if not matching_groups or pattern.startswith('~') or any(special in pattern for special in ('.', '?', '*', '[')):
# pattern might match host
matching_hosts = self._match_list(self._inventory.hosts, pattern)
if matching_hosts: