Compare commits

...

3 Commits

Author SHA1 Message Date
75c91e72cb 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
2023-05-01 20:27:12 +02:00
2a9a5cf394
Set ping_on_rotate
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Enable option to ensure minions are immediately responsive after key
rotations.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-05-01 20:24:13 +02:00
1089146801
Set env_order
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
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 <mail@georg-pfuetzenreuter.net>
2023-05-01 20:20:32 +02:00

View File

@ -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'}