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

Work with a copy of default opts dictionaries

Browse Source
This commit is contained in:
Denys Havrysh 2016-11-14 18:14:03 +02:00
parent b7c24811e5
commit fad5bec936
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config/__init__.py
View File

@ -1781,7 +1781,7 @@ def minion_config(path,
minion_opts = salt.config.minion_config('/etc/salt/minion') minion_opts = salt.config.minion_config('/etc/salt/minion')
''' '''
if defaults is None: if defaults is None:
defaults = DEFAULT_MINION_OPTS defaults = DEFAULT_MINION_OPTS.copy()
if path is not None and path.endswith('proxy'): if path is not None and path.endswith('proxy'):
defaults.update(DEFAULT_PROXY_MINION_OPTS) defaults.update(DEFAULT_PROXY_MINION_OPTS)
@ -3314,7 +3314,7 @@ def spm_config(path):
.. versionadded:: 2015.8.0 .. versionadded:: 2015.8.0
''' '''
# Let's grab a copy of salt's master default opts # Let's grab a copy of salt's master default opts
defaults = DEFAULT_MASTER_OPTS defaults = DEFAULT_MASTER_OPTS.copy()
# Let's override them with spm's required defaults # Let's override them with spm's required defaults
defaults.update(DEFAULT_SPM_OPTS) defaults.update(DEFAULT_SPM_OPTS)