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

Use master_config function

Browse Source
This commit is contained in:
Thomas S Hatch 2012-09-24 15:10:44 -06:00
parent b9e62d3ff3
commit 7ab650ff41
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
saltapi/config.py
View File

@ -14,11 +14,9 @@ def api_config(path):
Read in the salt master config file and add additional configs that
need to be stubbed out for cloudapi
'''
opts = {
'extension_modules': [],
}
opts = {}
salt.config.load_config(opts, path, 'SALT_MASTER_CONFIG')
opts = salt.config.master_config(path)
if 'include' in opts:
opts = salt.config.include_config(opts, path)