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

Set (pillar_)merge_lists to default for PR#30062

Browse source
This commit is contained in:
Sean Jenkins 2016-01-06 09:55:20 -07:00
parent fb6e895bf0
commit 8fc656b6f2
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/master
View file

@ -619,7 +619,7 @@
#pillar_source_merging_strategy: smart
# Recursively merge lists by aggregating them instead of replacing them.
#pillar_merge_lists: True
#pillar_merge_lists: False
##### Syndic settings #####

2
doc/ref/configuration/master.rst
View file

@ -2335,7 +2335,7 @@ Recursively merge lists by aggregating them instead of replacing them.
.. code-block:: yaml
pillar_merge_lists: True
pillar_merge_lists: False
.. conf_master:: pillar_source_merging_strategy

2
salt/config/__init__.py
View file

@ -1070,7 +1070,7 @@ DEFAULT_MASTER_OPTS = {
'pillar_opts': False,
'pillar_safe_render_error': True,
'pillar_source_merging_strategy': 'smart',
'pillar_merge_lists': True,
'pillar_merge_lists': False,
'ping_on_rotate': False,
'peer': {},
'preserve_minion_cache': False,

8
salt/pillar/__init__.py
View file

@ -541,7 +541,7 @@ class Pillar(object):
nstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'True'))
self.opts.get('pillar_merge_lists', 'False'))
if err:
errors += err
@ -581,7 +581,7 @@ class Pillar(object):
pstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'True'))
self.opts.get('pillar_merge_lists', 'False'))
return pillar, errors
@ -670,7 +670,7 @@ class Pillar(object):
ext,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'True'))
self.opts.get('pillar_merge_lists', 'False'))
ext = None
return pillar
@ -688,7 +688,7 @@ class Pillar(object):
self.opts['pillar'],
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'True'))
self.opts.get('pillar_merge_lists', 'False'))
else:
matches = self.top_matches(top)
pillar, errors = self.render_pillar(matches)

2
salt/pillar/git_pillar.py
View file

@ -263,7 +263,7 @@ def ext_pillar(minion_id, repo, pillar_dirs):
)
merge_lists = __opts__.get(
'pillar_merge_lists',
'True'
'False'
)
for pillar_dir, env in six.iteritems(pillar.pillar_dirs):
log.debug(

8
salt/utils/dictupdate.py
View file

@ -17,7 +17,7 @@ from salt.serializers.yamlex import merge_recursive as _yamlex_merge_recursive
log = logging.getLogger(__name__)
def update(dest, upd, recursive_update=True, merge_lists=True):
def update(dest, upd, recursive_update=True, merge_lists=False):
'''
Recursive version of the default dict.update
@ -76,7 +76,7 @@ def merge_list(obj_a, obj_b):
return ret
def merge_recurse(obj_a, obj_b, merge_lists=True):
def merge_recurse(obj_a, obj_b, merge_lists=False):
copied = copy.deepcopy(obj_a)
return update(copied, obj_b, merge_lists=merge_lists)
@ -85,14 +85,14 @@ def merge_aggregate(obj_a, obj_b):
return _yamlex_merge_recursive(obj_a, obj_b, level=1)
def merge_overwrite(obj_a, obj_b, merge_lists=True):
def merge_overwrite(obj_a, obj_b, merge_lists=False):
for obj in obj_b:
if obj in obj_a:
obj_a[obj] = obj_b[obj]
return merge_recurse(obj_a, obj_b, merge_lists=merge_lists)
def merge(obj_a, obj_b, strategy='smart', renderer='yaml', merge_lists=True):
def merge(obj_a, obj_b, strategy='smart', renderer='yaml', merge_lists=False):
if strategy == 'smart':
if renderer == 'yamlex' or renderer.startswith('yamlex_'):
strategy = 'aggregate'