From eb3643bfbba9596bfab91f530d137912505b9079 Mon Sep 17 00:00:00 2001 From: John Carlyle-Clarke Date: Thu, 9 Jul 2015 17:11:24 +0100 Subject: [PATCH] Add pillar_source_merging_strategy to master config --- salt/files/master.d/f_defaults.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 714a06c..272b149 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -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 ##### ##########################################