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

Merge pull request #30813 from alprs/fix-pillar_merge_list_default

Browse source 
Properly set the default value for pillar_merge_lists
This commit is contained in:
Colton Myers 2016-02-02 12:53:51 -07:00
commit f83845d7c3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/pillar/__init__.py
View file

@ -636,7 +636,7 @@ class Pillar(object):
nstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'False'))
self.opts.get('pillar_merge_lists', False))
if err:
errors += err
@ -674,7 +674,7 @@ class Pillar(object):
pstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'False'))
self.opts.get('pillar_merge_lists', False))
return pillar, errors
@ -761,7 +761,7 @@ class Pillar(object):
ext,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'False'))
self.opts.get('pillar_merge_lists', False))
ext = None
return pillar
@ -779,7 +779,7 @@ class Pillar(object):
self.opts['pillar'],
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', 'False'))
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

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