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 4

Conf file and changed option name to 'sched'

Browse source
This commit is contained in:
Mike Place 2016-07-24 11:51:24 -06:00
parent 7a86af3866
commit e793fe4203
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/master
View file

@ -45,6 +45,10 @@
# Directory used to store public key data:
#pki_dir: /etc/salt/pki/master
# Key cache. Increases master speed for large numbers of accepted
# keys. Available options: 'sched'. (Updates on a fixed schedule.)
#key_cache: ''
# Directory to store job and cache data:
# This directory may contain sensitive data and should be protected accordingly.
#

2
salt/master.py
View file

@ -260,7 +260,7 @@ class Maintenance(SignalHandlingMultiprocessingProcess):
Evaluate accepted keys and create a msgpack file
which contains a list
'''
if self.opts['key_cache'] == 'maint':
if self.opts['key_cache'] == 'sched':
keys = []
#TODO DRY from CKMinions
if self.opts['transport'] in ('zeromq', 'tcp'):