From af3dd436a53774bbb9070a0b6e8bf1d9ef876b62 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 30 Apr 2023 14:34:02 +0200 Subject: [PATCH] Allow saltenv/pillarenv override To ease development, allow saltenv=/pillarenv= instead of enforcing the production branch. Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/master.sls | 4 ++-- 1 file 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