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

Revert changes from #46520 that were not merged-forward correctly

Browse Source 
This removes the changes from #46520 that were merged-forward and not handled
correctly in #46907.

Changes to `salt/utils/schedule.py` cannot be merged forward to develop as the
code there has be significantly refactored. The change in #46520 will need to
be applied directly to `develop` instead.
This commit is contained in:
rallytime 2018-04-09 14:16:02 -04:00
parent 8a1f895f18
commit e3195e587d
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/minion.py
View File

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

9
salt/utils/schedule.py
View File

@ -110,11 +110,10 @@ 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, utils=None, standalone=False):
def __singleton_init__(self, opts, functions, returners=None, intervals=None, cleanup=None, proxy=None, standalone=False):
self.opts = opts
self.proxy = proxy
self.functions = functions
self.utils = utils
self.standalone = standalone
self.skip_function = None
self.skip_during_range = None
@ -598,11 +597,10 @@ class Schedule(object):
# This also needed for ZeroMQ transport to reset all functions
# context data that could keep paretns connections. ZeroMQ will
# hang on polling parents connections from the child process.
utils = self.utils or salt.loader.utils(self.opts)
if self.opts['__role'] == 'master':
self.functions = salt.loader.runner(self.opts, utils=utils)
self.functions = salt.loader.runner(self.opts)
else:
self.functions = salt.loader.minion_mods(self.opts, proxy=self.proxy, utils=utils)
self.functions = salt.loader.minion_mods(self.opts, proxy=self.proxy)
self.returners = salt.loader.returners(self.opts, self.functions, proxy=self.proxy)
ret = {'id': self.opts.get('id', 'master'),
'fun': func,
@ -1625,7 +1623,6 @@ class Schedule(object):
# Restore our function references.
self.functions = functions
self.returners = returners
self.utils = utils
def clean_proc_dir(opts):