From 997194c992bdcbc721a1458ff20208183b22973b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 10 Apr 2017 12:11:09 -0300 Subject: [PATCH 1/2] Wrong list name in config file --- salt/files/master.d/f_defaults.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index e2c8d0d..85983dd 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -73,7 +73,7 @@ # Note that enabling this feature means that minions will not be # available to target for up to the length of the maintanence loop # which by default is 60s. -{%- if cfg_minion['key_cache'] in cfg_master %} +{%- if cfg_master['key_cache'] in cfg_master %} {{ get_config('key_cache', '') }} {% else %} #key_cache: '' From 7093a329683e02564ac411ab275df22530347993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 10 Apr 2017 12:14:12 -0300 Subject: [PATCH 2/2] Simplify logic --- salt/files/master.d/f_defaults.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 85983dd..b2bd9d0 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -73,11 +73,7 @@ # Note that enabling this feature means that minions will not be # available to target for up to the length of the maintanence loop # which by default is 60s. -{%- if cfg_master['key_cache'] in cfg_master %} {{ get_config('key_cache', '') }} -{% else %} -#key_cache: '' -{% endif %} # Directory to store job and cache data: # This directory may contain sensitive data and should be protected accordingly.