Compare commits

..

No commits in common. "524c82cafafcd396e2ac4ee11441c51ca5e242fc" and "a7cd6609e6b029d5b17e764e050047440731a0e8" have entirely different histories.

View File

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