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 initial thorium engine config options

Browse source
This commit is contained in:
Thomas S Hatch 2016-02-02 09:47:56 -07:00 • committed by rallytime
parent 8e55ca4a39
commit 7a6e402b36
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/config/__init__.py
View file

@ -817,6 +817,10 @@ DEFAULT_MINION_OPTS = {
'startup_states': '',
'sls_list': [],
'top_file': '',
'thorium_interval': 0.5,
'thorium_roots': {
'base': [salt.syspaths.BASE_THORIUM_ROOTS_DIR],
},
'file_client': 'remote',
'use_master_when_local': False,
'file_roots': {
@ -1015,8 +1019,13 @@ DEFAULT_MASTER_OPTS = {
'base': [salt.syspaths.BASE_PILLAR_ROOTS_DIR,
salt.syspaths.SPM_PILLAR_PATH]
},
'thorium_interval': 0.5,
'thorium_roots': {
'base': [salt.syspaths.BASE_THORIUM_ROOTS_DIR],
},
'top_file_merging_strategy': 'merge',
'env_order': [],
'environment': None,
'default_top': 'base',
'file_client': 'local',
'git_pillar_base': 'master',