valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding some defaults for minion_blackout code when pillar & grains are not available in opts. Removing some debugging code.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2018-11-21 14:55:26 -08:00
parent 9f422b2a06
commit 48673b7db7
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/utils/schedule.py
View File

@ -583,7 +583,6 @@ class Schedule(object):
'''
Execute this method in a multiprocess or thread
'''
log.debug('=== calling handle_func with data %s ===', data)
if salt.utils.platform.is_windows() \
or self.opts.get('transport') == 'zeromq':
# Since function references can't be pickled and pickling
@ -634,13 +633,13 @@ class Schedule(object):
try:
minion_blackout_violation = False
if self.opts['pillar'].get('minion_blackout', False):
whitelist = self.opts['pillar'].get('minion_blackout_whitelist', [])
if self.opts.get('pillar', {}).get('minion_blackout', False):
whitelist = self.opts.get('pillar', {}).get('minion_blackout_whitelist', [])
# this minion is blacked out. Only allow saltutil.refresh_pillar and the whitelist
if func != 'saltutil.refresh_pillar' and func not in whitelist:
minion_blackout_violation = True
elif self.opts['grains'].get('minion_blackout', False):
whitelist = self.opts['grains'].get('minion_blackout_whitelist', [])
elif self.opts.get('grains', {}).get('minion_blackout', False):
whitelist = self.opts.get('grains', {}).get('minion_blackout_whitelist', [])
if func != 'saltutil.refresh_pillar' and func not in whitelist:
minion_blackout_violation = True
if minion_blackout_violation: