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 pull request #44385 from gtmanfred/schedule

Browse source 
schedule should be a dict in opts
This commit is contained in:
Nicole Thomas 2017-12-12 15:44:01 -05:00 • committed by GitHub
commit 1032ca3290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/config/__init__.py
View file

@ -977,6 +977,9 @@ VALID_OPTS = {
# (in other words, require that minions have 'minion_sign_messages'
# turned on)
'require_minion_sign_messages': bool,
# Scheduler should be a dictionary
'schedule': dict,
}
# default configurations
@ -1223,6 +1226,7 @@ DEFAULT_MINION_OPTS = {
'cache': 'localfs',
'salt_cp_chunk_size': 65536,
'minion_sign_messages': False,
'schedule': {},
}
DEFAULT_MASTER_OPTS = {
@ -1504,6 +1508,7 @@ DEFAULT_MASTER_OPTS = {
'salt_cp_chunk_size': 98304,
'require_minion_sign_messages': False,
'drop_messages_signature_fail': False,
'schedule': {},
}
@ -3338,10 +3343,6 @@ def apply_minion_config(overrides=None,
if 'ipc_write_buffer' not in overrides:
opts['ipc_write_buffer'] = 0
# if there is no schedule option yet, add an empty scheduler
if 'schedule' not in opts:
opts['schedule'] = {}
# Make sure hash_type is lowercase
opts['hash_type'] = opts['hash_type'].lower()