From 10891468015f0654ce63d6e5efe9a49a5d8521a0 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Mon, 1 May 2023 20:20:32 +0200 Subject: Set env_order Option was removed in d4f39e8e5f807169b790d5380c10872d1ba31710, but the default environment seems to not be set to "production" without it being present. Adding it back until a better way is found. Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/master.sls | 1 + 1 file changed, 1 insertion(+) (limited to 'pillar') diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls index b1a0f2e..77aa44f 100644 --- a/pillar/role/salt/master.sls +++ b/pillar/role/salt/master.sls @@ -54,6 +54,7 @@ salt: pillar_merge_lists: True pillar_source_merging_strategy: smart top_file_merging_strategy: same + env_order: ['production'] log_level: info show_jid: True timeout: 20 -- cgit v1.2.3 From 2a9a5cf394efe121858ee3330941236862ad9165 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Mon, 1 May 2023 20:24:13 +0200 Subject: Set ping_on_rotate Enable option to ensure minions are immediately responsive after key rotations. Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/master.sls | 1 + 1 file changed, 1 insertion(+) (limited to 'pillar') diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls index 77aa44f..e30d4e9 100644 --- a/pillar/role/salt/master.sls +++ b/pillar/role/salt/master.sls @@ -60,6 +60,7 @@ salt: timeout: 20 gather_job_timeout: 20 keep_jobs: 30 + ping_on_rotate: True user: ${'secret_salt:master:user'} syndic_user: ${'secret_salt:master:syndic_user'} cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'} -- cgit v1.2.3