summaryrefslogtreecommitdiffstats
path: root/pillar/role/salt/master.sls
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-05-01 20:27:12 +0200
committerGeorg Pfuetzenreuter2023-05-01 20:27:12 +0200
commit75c91e72cb1fc38425fefc1189f8e1f5c8a7c207 (patch)
treeedcd32d7e9d7a0118092c3667e469eb2bba6d392 /pillar/role/salt/master.sls
parent27d178d852c9e07ed58751a38bc42b1153821bfd (diff)
parent2a9a5cf394efe121858ee3330941236862ad9165 (diff)
downloadsalt-75c91e72cb1fc38425fefc1189f8e1f5c8a7c207.tar.gz
salt-75c91e72cb1fc38425fefc1189f8e1f5c8a7c207.tar.bz2
salt-75c91e72cb1fc38425fefc1189f8e1f5c8a7c207.zip
Merge pull request 'Set env_order + ping_on_rotate' (#58) from saltenv into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/58
Diffstat (limited to 'pillar/role/salt/master.sls')
-rw-r--r--pillar/role/salt/master.sls2
1 files changed, 2 insertions, 0 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index b1a0f2e..e30d4e9 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -54,11 +54,13 @@ 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
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'}