diff options
| author | Georg Pfuetzenreuter | 2023-04-30 14:49:12 +0200 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-04-30 14:49:12 +0200 |
| commit | 524c82cafafcd396e2ac4ee11441c51ca5e242fc (patch) | |
| tree | 07fe29882068fc4ac7e608810a3758fbc863b6e0 /pillar/role/salt | |
| parent | a7cd6609e6b029d5b17e764e050047440731a0e8 (diff) | |
| parent | d4f39e8e5f807169b790d5380c10872d1ba31710 (diff) | |
| download | salt-524c82cafafcd396e2ac4ee11441c51ca5e242fc.tar.gz salt-524c82cafafcd396e2ac4ee11441c51ca5e242fc.tar.bz2 salt-524c82cafafcd396e2ac4ee11441c51ca5e242fc.zip | |
Merge pull request 'Allow saltenv/pillarenv override' (#45) from saltenv into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/45
Diffstat (limited to 'pillar/role/salt')
| -rw-r--r-- | pillar/role/salt/master.sls | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls index b53f946..b1a0f2e 100644 --- a/pillar/role/salt/master.sls +++ b/pillar/role/salt/master.sls @@ -21,7 +21,7 @@ salt: - roots - git file_roots: - production: + __env__: {%- for formula in formulas %} - /srv/formulas/{{ formula }}-formula {%- endfor %} @@ -30,6 +30,7 @@ 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'} @@ -53,7 +54,6 @@ 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 |