diff options
Diffstat (limited to 'pillar/role/salt/master.sls')
| -rw-r--r-- | pillar/role/salt/master.sls | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls index 9970543..36df21e 100644 --- a/pillar/role/salt/master.sls +++ b/pillar/role/salt/master.sls @@ -15,10 +15,9 @@ salt: file_roots: base: - /srv/formulas/salt-formula + gitfs_root: salt gitfs_remotes: - https://git.com.de/LibertaCasa/salt.git: - - root: salt - - base: production - user: ${'secret_salt:master:gitfs_remotes:LibertaCasa:user'} - password: ${'secret_salt:master:gitfs_remotes:LibertaCasa:password'} ext_pillar: @@ -39,8 +38,12 @@ salt: - root: ${'secret_salt:master:ext_pillar:git:Lysergic:root'} - user: ${'secret_salt:master:ext_pillar:git:Lysergic:user'} - password: ${'secret_salt:master:ext_pillar:git:Lysergic:password'} + - lookup: ext_pillar_first: True 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 |