From e793fe42033ab60aae4a644e4652a7e6650f812c Mon Sep 17 00:00:00 2001 From: Mike Place Date: Sun, 24 Jul 2016 11:51:24 -0600 Subject: [PATCH] Conf file and changed option name to 'sched' --- conf/master | 4 ++++ salt/master.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/master b/conf/master index 93e401684a5..218b1e55b19 100644 --- a/conf/master +++ b/conf/master @@ -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. # diff --git a/salt/master.py b/salt/master.py index 418a439552a..522d322f12e 100644 --- a/salt/master.py +++ b/salt/master.py @@ -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'):