Compare commits
No commits in common. "524c82cafafcd396e2ac4ee11441c51ca5e242fc" and "a7cd6609e6b029d5b17e764e050047440731a0e8" have entirely different histories.
524c82cafa
...
a7cd6609e6
@ -21,7 +21,7 @@ salt:
|
|||||||
- roots
|
- roots
|
||||||
- git
|
- git
|
||||||
file_roots:
|
file_roots:
|
||||||
__env__:
|
production:
|
||||||
{%- for formula in formulas %}
|
{%- for formula in formulas %}
|
||||||
- /srv/formulas/{{ formula }}-formula
|
- /srv/formulas/{{ formula }}-formula
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
@ -30,7 +30,6 @@ 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'}
|
||||||
@ -54,6 +53,7 @@ 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user