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

Ensure that ext_pillar begins with pillar_override if ext_pillar_first is True

Browse source
This commit is contained in:
Erik Johnson 2017-02-28 11:46:07 -06:00
parent f951266944
commit 97dd8a13d9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/pillar/__init__.py
View file

@ -824,7 +824,9 @@ class Pillar(object):
top, top_errors = self.get_top()
if ext:
if self.opts.get('ext_pillar_first', False):
self.opts['pillar'], errors = self.ext_pillar({}, pillar_dirs)
self.opts['pillar'], errors = self.ext_pillar(
self.pillar_override,
pillar_dirs)
self.rend = salt.loader.render(self.opts, self.functions)
matches = self.top_matches(top)
pillar, errors = self.render_pillar(matches, errors=errors)