Merge pull request 'Set env_order + ping_on_rotate' (#58) from saltenv into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful

Reviewed-on: #58
This commit is contained in:
Georg Pfuetzenreuter 2023-05-01 20:27:12 +02:00
commit 75c91e72cb

View File

@ -54,11 +54,13 @@ salt:
pillar_merge_lists: True pillar_merge_lists: True
pillar_source_merging_strategy: smart pillar_source_merging_strategy: smart
top_file_merging_strategy: same top_file_merging_strategy: same
env_order: ['production']
log_level: info log_level: info
show_jid: True show_jid: True
timeout: 20 timeout: 20
gather_job_timeout: 20 gather_job_timeout: 20
keep_jobs: 30 keep_jobs: 30
ping_on_rotate: True
user: ${'secret_salt:master:user'} user: ${'secret_salt:master:user'}
syndic_user: ${'secret_salt:master:syndic_user'} syndic_user: ${'secret_salt:master:syndic_user'}
cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'} cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'}