valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix salt-syndic's log_level not consistent with salt-master​

Browse Source 
some parameters of salt-master is covered by default salt-minion(if /etc/salt/minion doesn't exists), such as log_level
This commit is contained in:
sun 2016-08-22 14:49:13 +08:00 committed by GitHub
parent d6f86f439b
commit b7d19b4b42
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config/__init__.py
View File

@ -1904,8 +1904,8 @@ def syndic_config(master_config_path,
)
opts['_minion_conf_file'] = master_opts['conf_file']
opts['_master_conf_file'] = minion_opts['conf_file']
opts.update(master_opts)
opts.update(minion_opts)
opts.update(master_opts)
syndic_opts = {
'__role': 'syndic',
'root_dir': opts.get('root_dir', salt.syspaths.ROOT_DIR),