grains_deep_merge default value

This commit is contained in:
Christophe Drevet-Droguet 2015-10-23 20:30:22 +02:00
parent 03fe8c7885
commit af6d37caaf

View File

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