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

Use syspaths

Browse Source
This commit is contained in:
Joseph Hall 2015-01-21 10:17:57 -07:00
parent b8a531a955
commit dcf6304f0d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/utils/http.py
View File

@ -90,12 +90,17 @@ def query(url,
if opts is None:
if node == 'master':
opts = salt.config.master_config('/etc/salt/master')
opts = salt.config.master_config(
os.path.join(syspaths.CONFIG_DIR, 'master')
)
elif node == 'minion':
opts = salt.config.master_config('/etc/salt/minion')
opts = salt.config.master_config(
os.path.join(syspaths.CONFIG_DIR, 'minion')
)
else:
opts = {}
if requests_lib is None:
requests_lib = opts.get('requests_lib', False)