actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

updated saltmaster

Browse source
This commit is contained in:
Actaeus Curabitur 2022-09-08 06:51:38 -05:00
parent e4fe3a92a8
commit 2bb1300c53
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
states/roles/maintain/saltmaster/master
View file

@ -441,7 +441,15 @@ file_roots:
# To specify the order in which environments are merged, set the ordering # To specify the order in which environments are merged, set the ordering
# in the env_order option. Given a conflict, the last matching value will # in the env_order option. Given a conflict, the last matching value will
# win. # win.
env_order: ['qual', 'prod'] {% if pillar['branches'] is defined -%}
{%- if pillar['branches']['saltmaster'] is defined -%}
env_order: [
{%- for branch in pillar['branches']['saltmaster'] -%}
'{{-branch}}',
{%- endfor -%}
'null']
{%- endif %}
{%- endif %}
# If top_file_merging_strategy is set to 'same' and an environment does not # If top_file_merging_strategy is set to 'same' and an environment does not
# contain a top file, the top file in the environment specified by default_top # contain a top file, the top file in the environment specified by default_top