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

A deep copy should be used for default options.

Browse Source 
Use deep copy to get default master and minion options to avoid altering
them.

This fixes an issue encountered when defining grains for multiple nodes in a salt-cloud map file.
Nodes deployed later in the process were getting grains for previously deployed nodes.
This commit is contained in:
derrick.birkes 2014-06-10 15:22:55 -06:00
parent 8ae3268037
commit ce07b0e75d
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/utils/cloud.py
View File

@ -188,7 +188,7 @@ def minion_config(opts, vm_):
'''
# Let's get a copy of the salt minion default options
minion = salt.config.DEFAULT_MINION_OPTS.copy()
minion = copy.deepcopy(salt.config.DEFAULT_MINION_OPTS)
# Some default options are Null, let's set a reasonable default
minion.update(
log_level='info',
@ -233,7 +233,7 @@ def master_config(opts, vm_):
Return a master's configuration for the provided options and VM
'''
# Let's get a copy of the salt master default options
master = salt.config.DEFAULT_MASTER_OPTS.copy()
master = copy.deepcopy(salt.config.DEFAULT_MASTER_OPTS)
# Some default options are Null, let's set a reasonable default
master.update(
log_level='info',