return empty host list when pattern is empty

fixes #37894

(cherry picked from commit 2e852fcd6d)
pull/39358/merge
Brian Coca 7 years ago committed by Brian Coca
parent 19ab7b4b64
commit b595c6254f

@ -0,0 +1,2 @@
bugfixes:
- return empty list if host pattern is empty https://github.com/ansible/ansible/pull/37931

@ -330,49 +330,52 @@ class InventoryManager(object):
or applied subsets or applied subsets
""" """
hosts = []
# Check if pattern already computed # Check if pattern already computed
if isinstance(pattern, list): if isinstance(pattern, list):
pattern_hash = u":".join(pattern) pattern_hash = u":".join(pattern)
else: else:
pattern_hash = pattern pattern_hash = pattern
if not ignore_limits and self._subset: if pattern_hash:
pattern_hash += ":%s" % to_native(self._subset) if not ignore_limits and self._subset:
pattern_hash += u":%s" % to_text(self._subset, errors='surrogate_or_strict')
if not ignore_restrictions and self._restriction: if not ignore_restrictions and self._restriction:
pattern_hash += ":%s" % to_native(self._restriction) pattern_hash += u":%s" % to_text(self._restriction, errors='surrogate_or_strict')
if pattern_hash not in self._hosts_patterns_cache: if pattern_hash not in self._hosts_patterns_cache:
patterns = split_host_pattern(pattern) patterns = split_host_pattern(pattern)
hosts = self._evaluate_patterns(patterns) hosts = self._evaluate_patterns(patterns)
# mainly useful for hostvars[host] access # mainly useful for hostvars[host] access
if not ignore_limits and self._subset: if not ignore_limits and self._subset:
# exclude hosts not in a subset, if defined # exclude hosts not in a subset, if defined
subset = self._evaluate_patterns(self._subset) subset = self._evaluate_patterns(self._subset)
hosts = [h for h in hosts if h in subset] hosts = [h for h in hosts if h in subset]
if not ignore_restrictions and self._restriction: if not ignore_restrictions and self._restriction:
# exclude hosts mentioned in any restriction (ex: failed hosts) # exclude hosts mentioned in any restriction (ex: failed hosts)
hosts = [h for h in hosts if h.name in self._restriction] hosts = [h for h in hosts if h.name in self._restriction]
seen = set() seen = set()
self._hosts_patterns_cache[pattern_hash] = [x for x in hosts if x not in seen and not seen.add(x)] self._hosts_patterns_cache[pattern_hash] = [x for x in hosts if x not in seen and not seen.add(x)]
# sort hosts list if needed (should only happen when called from strategy) # sort hosts list if needed (should only happen when called from strategy)
if order in ['sorted', 'reverse_sorted']: if order in ['sorted', 'reverse_sorted']:
from operator import attrgetter from operator import attrgetter
hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], key=attrgetter('name'), reverse=(order == 'reverse_sorted')) hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], key=attrgetter('name'), reverse=(order == 'reverse_sorted'))
elif order == 'reverse_inventory': elif order == 'reverse_inventory':
hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], reverse=True) hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], reverse=True)
else: else:
hosts = self._hosts_patterns_cache[pattern_hash][:] hosts = self._hosts_patterns_cache[pattern_hash][:]
if order == 'shuffle': if order == 'shuffle':
from random import shuffle from random import shuffle
shuffle(hosts) shuffle(hosts)
elif order not in [None, 'inventory']: elif order not in [None, 'inventory']:
AnsibleOptionsError("Invalid 'order' specified for inventory hosts: %s" % order) AnsibleOptionsError("Invalid 'order' specified for inventory hosts: %s" % order)
return hosts return hosts

Loading…
Cancel
Save