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

Merge branch '2018.3' into bp-47005

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-03-15 18:09:24 -07:00 • committed by GitHub
commit f68caa633f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/topics/beacons/index.rst
View file

@ -305,7 +305,7 @@ the minion. The ``beacon`` function therefore cannot block and should be as
lightweight as possible. The ``beacon`` also must return a list of dicts, each
dict in the list will be translated into an event on the master.
Beacons may also choose to implement a ``__validate__`` function which
Beacons may also choose to implement a ``validate`` function which
takes the beacon configuration as an argument and ensures that it
is valid prior to continuing. This function is called automatically
by the Salt loader when a beacon is loaded.

2
salt/beacons/aix_account.py
View file

@ -27,7 +27,7 @@ def __virtual__():
'only available on AIX systems.')
def __validate__(config):
def validate(config):
'''
Validate the beacon configuration
'''

7
salt/utils/minions.py
View file

@ -271,9 +271,10 @@ class CkMinions(object):
regex_match=False,
exact_match=False):
'''
Helper function to search for minions in master caches
If 'greedy' return accepted minions that matched by the condition or absend in the cache.
If not 'greedy' return the only minions have cache data and matched by the condition.
Helper function to search for minions in master caches If 'greedy',
then return accepted minions matched by the condition or those absent
from the cache. If not 'greedy' return the only minions have cache
data and matched by the condition.
'''
cache_enabled = self.opts.get('minion_data_cache', False)