saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ignore missing minions only when excluding them with 'not'

Browse source 
Co-authored-by: Mihai Dinca <Mihai.Dinca@suse.com>
This commit is contained in:
Jochen Breuer 2018-08-31 15:44:38 +02:00
parent 6a5f3cd041
commit 0d647162e5
No known key found for this signature in database
GPG key ID: 29ACE79F4D5EEE69
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/minions.py
View file

@ -213,7 +213,7 @@ class CkMinions(object):
return {'minions': fnmatch.filter(self._pki_minions(), expr),
'missing': []}
def _check_list_minions(self, expr, greedy): # pylint: disable=unused-argument
def _check_list_minions(self, expr, greedy, ignore_missing=False): # pylint: disable=unused-argument
'''
Return the minions found by looking via a list
'''
@ -221,7 +221,7 @@ class CkMinions(object):
expr = [m for m in expr.split(',') if m]
minions = self._pki_minions()
return {'minions': [x for x in expr if x in minions],
'missing': []}
'missing': [] if ignore_missing else [x for x in expr if x not in minions]}
def _check_pcre_minions(self, expr, greedy): # pylint: disable=unused-argument
'''
@ -572,6 +572,8 @@ class CkMinions(object):
engine_args.append(target_info['delimiter'] or ':')
engine_args.append(greedy)
# ignore missing minions if we exclude them with a 'not'
engine_args.append(results and results[-1] == '-')
_results = engine(*engine_args)
results.append(six.text_type(set(_results['minions'])))
missing.extend(_results['missing'])