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

Pass actual renderers to the Reactor's Compiler

Browse source 
Weird issue, from looking at the old versions of the code it looks like it was also broken (at least on class init) but something afterwards came in and changed the pointer (SCARY!). This removes the need to load the renderers twice (bonus!) in addition to fixing the reported issue.

Fixes #25852
This commit is contained in:
Thomas Jackson 2015-07-31 09:48:26 -07:00
parent 9a569da4ee
commit cf7479aa0a
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/state.py
View file

@ -245,9 +245,9 @@ class Compiler(object):
'''
Class used to compile and manage the High Data structure
'''
def __init__(self, opts):
def __init__(self, opts, renderers):
self.opts = opts
self.rend = salt.loader.render(self.opts, {})
self.rend = renderers
def render_template(self, template, **kwargs):
'''

5
salt/utils/reactor.py
View file

@ -29,11 +29,10 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
'''
def __init__(self, opts):
multiprocessing.Process.__init__(self)
salt.state.Compiler.__init__(self, opts)
local_minion_opts = self.opts.copy()
local_minion_opts = opts.copy()
local_minion_opts['file_client'] = 'local'
self.minion = salt.minion.MasterMinion(local_minion_opts)
salt.state.Compiler.__init__(self, opts, self.minion.rend)
def render_reaction(self, glob_ref, tag, data):
'''