Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-21 23:24:38 +02:00
Code Issues Activity

Add pillar_source_merging_strategy to master config

Browse Source
This commit is contained in:
John Carlyle-Clarke 2015-07-09 17:11:24 +01:00
parent f4a823a896
commit eb3643bfbb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/files/master.d/f_defaults.conf
View File

@ -695,6 +695,14 @@ ext_pillar:
# master config file that can then be used on minions.
{{ get_config('pillar_opts', 'True') }}
# The pillar_source_merging_strategy option allows you to configure merging strategy
# between different sources. It accepts four values: recurse, aggregate, overwrite,
# or smart. Recurse will merge recursively mapping of data. Aggregate instructs
# aggregation of elements between sources that use the #!yamlex renderer. Overwrite
# will verwrite elements according the order in which they are processed. This is
# behavior of the 2014.1 branch and earlier. Smart guesses the best strategy based
# on the "renderer" setting and is the default value.
{{ get_config('pillar_source_merging_strategy', 'smart') }}
##### Syndic settings #####
##########################################