valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #33076 from cachedout/win_grains

Browse Source 
Avoid second grains load on windows multiprocessing
This commit is contained in:
Mike Place 2016-05-25 10:10:06 -07:00
commit 4cf40da7d7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/minion.py
View File

@ -837,7 +837,7 @@ class Minion(MinionBase):
# module. If this is a proxy, however, we need to init the proxymodule
# before we can get the grains. We do this for proxies in the
# post_master_init
if not salt.utils.is_proxy():
if not salt.utils.is_proxy() and not self.opts.get('grains'):
self.opts['grains'] = salt.loader.grains(opts)
log.info('Creating minion process manager')
@ -1050,7 +1050,7 @@ class Minion(MinionBase):
)
self.event_publisher.handle_publish(event, None)
def _load_modules(self, force_refresh=False, notify=False):
def _load_modules(self, force_refresh=False, notify=False, grains=None):
'''
Return the functions and the returners loaded up from the loader
module
@ -1078,8 +1078,9 @@ class Minion(MinionBase):
else:
proxy = None
self.opts['grains'] = salt.loader.grains(self.opts, force_refresh, proxy=proxy)
self.utils = salt.loader.utils(self.opts)
if grains is None:
self.opts['grains'] = salt.loader.grains(self.opts, force_refresh, proxy=proxy)
self.utils = salt.loader.utils(self.opts)
if self.opts.get('multimaster', False):
s_opts = copy.deepcopy(self.opts)
@ -1219,7 +1220,7 @@ class Minion(MinionBase):
minion_instance = cls(opts)
if not hasattr(minion_instance, 'functions'):
functions, returners, function_errors, executors = (
minion_instance._load_modules()
minion_instance._load_modules(grains=opts['grains'])
)
minion_instance.functions = functions
minion_instance.returners = returners