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

fix salt-api opts

Browse source
This commit is contained in:
xiaofei.sun 2016-08-24 23:20:01 +08:00
parent 7877ff1d5e
commit ea0d74cd27
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/config/__init__.py
View file

@ -1383,8 +1383,8 @@ CLOUD_CONFIG_DEFAULTS = {
DEFAULT_API_OPTS = {
# ----- Salt master settings overridden by Salt-API --------------------->
'pidfile': '/var/run/salt-api.pid',
'logfile': '/var/log/salt/api',
'pidfile': os.path.join(salt.syspaths.PIDFILE_DIR, 'salt-api.pid'),
'log_file': os.path.join(salt.syspaths.LOGS_DIR, 'api'),
'rest_timeout': 300,
# <---- Salt master settings overridden by Salt-API ----------------------
}
@ -3273,10 +3273,11 @@ def api_config(path):
'''
# Let's grab a copy of salt's master default opts
defaults = DEFAULT_MASTER_OPTS
opts = client_config(path, defaults=defaults)
# Let's override them with salt-api's required defaults
defaults.update(DEFAULT_API_OPTS)
opts.update(DEFAULT_API_OPTS)
return opts
return client_config(path, defaults=defaults)
def spm_config(path):