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

Fix pillar merging when ext_pillar_first is enabled

Browse source 
ext_pillar was being merged into pillar, when it should have been the
other way around. This means that when ext_pillar_first was enabled,
pillar keys with the same name as ones defined in ext_pillar were being
lost instead of overriding ext_pillar.
This commit is contained in:
Erik Johnson 2016-10-05 15:44:04 -05:00
parent 3e6b16de2b
commit 7d60e73308
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/pillar/__init__.py
View file

@ -791,8 +791,8 @@ class Pillar(object):
self.opts['pillar'], errors = self.ext_pillar({}, pillar_dirs)
matches = self.top_matches(top)
pillar, errors = self.render_pillar(matches, errors=errors)
pillar = merge(pillar,
self.opts['pillar'],
pillar = merge(self.opts['pillar'],
pillar,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', False))