saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated documentation

Browse source
This commit is contained in:
Yoram Hekma 2016-09-20 11:05:17 +02:00
parent 180991777e
commit 6becc0d1e7
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/master
View file

@ -694,9 +694,9 @@
#pillar_safe_render_error: 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
# between different sources. It accepts five values: none, recurse, aggregate, overwrite,
# or smart. None will not do any merging at all. Recurse will merge recursively mapping of data.
# Aggregate instructs aggregation of elements between sources that use the #!yamlex renderer. Overwrite
# will overwrite 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.

7
doc/man/salt.7
View file

@ -7571,9 +7571,14 @@ New in version 2014.7.0.
Default: \fBsmart\fP
.sp
The pillar_source_merging_strategy option allows you to configure merging
strategy between different sources. It accepts 4 values:
strategy between different sources. It accepts 5 values:
.INDENT 0.0
.IP \(bu 2
\fBnone\fP:
.sp
it will not do any merging at all and only parse the pillar data from the passed
environment and 'base' if no environment was specified.
.IP \(bu 2
\fBrecurse\fP:
.sp
it will merge recursively mapping of data. For example, theses 2 sources:

3
doc/ref/configuration/master.rst
View file

@ -2791,6 +2791,9 @@ Default: ``smart``
The pillar_source_merging_strategy option allows you to configure merging
strategy between different sources. It accepts 4 values:
* ``none``:
it will not do any merging at all and only parse the pillar data from the passed environment and 'base' if no environment was specified.
* ``recurse``:
it will merge recursively mapping of data. For example, theses 2 sources: