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

Reload renderers for local pillar after gitfs (#32912)

Browse Source 
Because of the way the renderers are lazy loaded when using ext_pillar_first
and gitfs external pillar, the renderers for the local pillar object were
being set to the last loaded gitfs pillar.

This was causing the local pillar to fail to render.  This small fix
forces a reload of the renderers after all the external pillars are done
loading.
This commit is contained in:
steven 'haji' hajducko 2016-04-28 08:57:25 -07:00 committed by Nicole Thomas
parent a98dea7503
commit 98767d521d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/pillar/__init__.py
View File

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