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

Fix pillar.get (#32663)

Browse Source 
Partial backport of #31319
This commit is contained in:
Mike Place 2016-04-18 15:48:45 -06:00
parent d719765a10
commit fa8e39bde0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/minion.py
View File

@ -914,7 +914,6 @@ class Minion(MinionBase):
'''
self.opts['master'] = master
self.functions, self.returners, self.function_errors, self.executors = self._load_modules()
self.opts['pillar'] = yield salt.pillar.get_async_pillar(
self.opts,
self.opts['grains'],
@ -922,6 +921,7 @@ class Minion(MinionBase):
self.opts['environment'],
pillarenv=self.opts.get('pillarenv')
).compile_pillar()
self.functions, self.returners, self.function_errors, self.executors = self._load_modules()
self.serial = salt.payload.Serial(self.opts)
self.mod_opts = self._prep_mod_opts()
self.matcher = Matcher(self.opts, self.functions)