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 2

add default_top description to docs

Browse source
This commit is contained in:
Justin Findlay 2015-08-24 13:50:13 -06:00
parent 2f9b40ca25
commit 559512b0a6
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
conf/master
View file

@ -424,12 +424,17 @@
# default behaviour is an unordered merge. To prevent top files from
# being merged together and instead to only use the top file from the
# requested environment, set this value to 'same'.
# top_file_merging_strategy: merge
#top_file_merging_strategy: merge
# 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
# win.
# env_order: ['base', 'dev', 'prod']
#env_order: ['base', 'dev', 'prod']
# 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
# will be used instead.
#default_top: base
# The hash_type is the hash to use when discovering the hash of a file on
# the master server. The default is md5, but sha1, sha224, sha256, sha384

4
doc/ref/states/top.rst
View file

@ -362,3 +362,7 @@ control the behaviour of salt:
top files will be merged together. The order in which top files are
merged together can be controlled with `env_order`.
- `default_top`
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` will be used instead.