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 utils to the scheduler for reloading in modules

Browse source
This commit is contained in:
Daniel Wallace 2018-03-13 10:58:41 -06:00
parent 0e90c8ca6f
commit 2883548e6b
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/minion.py
View file

@ -2275,6 +2275,7 @@ class Minion(MinionBase):
self.opts,
self.functions,
self.returners,
utils=self.utils,
cleanup=[master_event(type='alive')])
try:

7
salt/utils/schedule.py
View file

@ -402,10 +402,11 @@ class Schedule(object):
pass
# an init for the singleton instance to call
def __singleton_init__(self, opts, functions, returners=None, intervals=None, cleanup=None, proxy=None):
def __singleton_init__(self, opts, functions, returners=None, intervals=None, cleanup=None, proxy=None, utils=None):
self.opts = opts
self.proxy = proxy
self.functions = functions
self.utils = utils
if isinstance(intervals, dict):
self.intervals = intervals
else:
@ -752,9 +753,9 @@ class Schedule(object):
# context data that could keep paretns connections. ZeroMQ will
# hang on polling parents connections from the child process.
if self.opts['__role'] == 'master':
self.functions = salt.loader.runner(self.opts)
self.functions = salt.loader.runner(self.opts, utils=self.utils)
else:
self.functions = salt.loader.minion_mods(self.opts, proxy=self.proxy)
self.functions = salt.loader.minion_mods(self.opts, proxy=self.proxy, utils=self.utils)
self.returners = salt.loader.returners(self.opts, self.functions, proxy=self.proxy)
ret = {'id': self.opts.get('id', 'master'),
'fun': func,