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

Merge pull request #36412 from rallytime/merge-carbon

Browse Source 
[carbon] Merge forward from 2016.3 to carbon
This commit is contained in:
Nicole Thomas 2016-09-19 12:59:18 -06:00 committed by GitHub
commit b658de4c33
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/topics/cloud/vmware.rst
View File

@ -584,7 +584,7 @@ Example of a minimal profile:
Cloning from a Snapshot Cloning from a Snapshot
======================= =======================
.. versionadded:: Carbon .. versionadded:: 2016.3.4
Cloning a template works similar to cloning a VM except for the fact that Cloning a template works similar to cloning a VM except for the fact that
a snapshot number must be provided. a snapshot number must be provided.

17
salt/config/__init__.py
View File

@ -1461,8 +1461,8 @@ CLOUD_CONFIG_DEFAULTS = {
DEFAULT_API_OPTS = { DEFAULT_API_OPTS = {
# ----- Salt master settings overridden by Salt-API ---------------------> # ----- Salt master settings overridden by Salt-API --------------------->
'pidfile': '/var/run/salt-api.pid', 'api_pidfile': os.path.join(salt.syspaths.PIDFILE_DIR, 'salt-api.pid'),
'logfile': '/var/log/salt/api', 'api_logfile': os.path.join(salt.syspaths.LOGS_DIR, 'api'),
'rest_timeout': 300, 'rest_timeout': 300,
# <---- Salt master settings overridden by Salt-API ---------------------- # <---- Salt master settings overridden by Salt-API ----------------------
} }
@ -3365,12 +3365,15 @@ def api_config(path):
Read in the salt master config file and add additional configs that Read in the salt master config file and add additional configs that
need to be stubbed out for salt-api need to be stubbed out for salt-api
''' '''
# Let's grab a copy of salt's master default opts # Let's grab a copy of salt's master opts
defaults = DEFAULT_MASTER_OPTS opts = client_config(path, defaults=DEFAULT_MASTER_OPTS)
# Let's override them with salt-api's required defaults # Let's override them with salt-api's required defaults
defaults.update(DEFAULT_API_OPTS) api_opts = {
'log_file': opts.get('api_logfile', DEFAULT_API_OPTS['api_logfile']),
return client_config(path, defaults=defaults) 'pidfile': opts.get('api_pidfile', DEFAULT_API_OPTS['api_pidfile'])
}
opts.update(api_opts)
return opts
def spm_config(path): def spm_config(path):