valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grains_deep_merge default value

Browse Source
This commit is contained in:
Christophe Drevet-Droguet 2015-10-23 20:30:22 +02:00
parent 03fe8c7885
commit af6d37caaf
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/config/__init__.py
View File

@ -798,6 +798,7 @@ DEFAULT_MINION_OPTS = {
'cache_jobs': False, 'cache_jobs': False,
'grains_cache': False, 'grains_cache': False,
'grains_cache_expiration': 300, 'grains_cache_expiration': 300,
'grains_deep_merge': False,
'conf_file': os.path.join(salt.syspaths.CONFIG_DIR, 'minion'), 'conf_file': os.path.join(salt.syspaths.CONFIG_DIR, 'minion'),
'sock_dir': os.path.join(salt.syspaths.SOCK_DIR, 'minion'), 'sock_dir': os.path.join(salt.syspaths.SOCK_DIR, 'minion'),
'backup_mode': '', 'backup_mode': '',