saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #122 from matthew-parlette/master

Browse Source 
Updated master.d/f_defaults for 2014.7
This commit is contained in:
Brian Jackson 2015-07-07 12:43:01 -05:00
commit 779e6c9c63
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 0.17.4 default config # Based on salt version 2014.7 default config
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%} {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%}
{% set cfg_salt = pillar.get('salt', {}) -%} {% set cfg_salt = pillar.get('salt', {}) -%}
{% set cfg_master = cfg_salt.get('master', {}) -%} {% set cfg_master = cfg_salt.get('master', {}) -%}
@ -697,6 +697,14 @@ ext_pillar:
# master config file that can then be used on minions. # master config file that can then be used on minions.
{{ get_config('pillar_opts', 'True') }} {{ 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 ##### ##### Syndic settings #####
########################################## ##########################################