LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge pull request 'Allow saltenv/pillarenv override' (#45) from saltenv into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details

Browse Source 
Reviewed-on: #45
This commit is contained in:
Georg Pfuetzenreuter 2023-04-30 14:49:12 +02:00
commit 524c82cafa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/role/salt/master.sls
View File

@ -21,7 +21,7 @@ salt:
- roots - roots
- git - git
file_roots: file_roots:
production: __env__:
{%- for formula in formulas %} {%- for formula in formulas %}
- /srv/formulas/{{ formula }}-formula - /srv/formulas/{{ formula }}-formula
{%- endfor %} {%- endfor %}
@ -30,6 +30,7 @@ salt:
- https://git.com.de/LibertaCasa/salt.git: - https://git.com.de/LibertaCasa/salt.git:
- user: ${'secret_salt:master:gitfs_remotes:LibertaCasa:user'} - user: ${'secret_salt:master:gitfs_remotes:LibertaCasa:user'}
- password: ${'secret_salt:master:gitfs_remotes:LibertaCasa:password'} - password: ${'secret_salt:master:gitfs_remotes:LibertaCasa:password'}
- fallback: production
ext_pillar: ext_pillar:
- netbox: - netbox:
api_url: ${'secret_salt:master:ext_pillar:netbox:api_url'} api_url: ${'secret_salt:master:ext_pillar:netbox:api_url'}
@ -53,7 +54,6 @@ 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