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

Flip sense of test for grains load at end of regular minion startup

Browse source
This commit is contained in:
C. R. Oldham 2015-10-09 18:51:46 -06:00
parent 37c145bcd5
commit b15083d719
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/minion.py
View file

@ -703,8 +703,9 @@ class Minion(MinionBase):
'upgrade your ZMQ!'
)
# Late setup the of the opts grains, so we can log from the grains
# module
if salt.utils.is_proxy():
# module. If this is a proxy, however, we need to init the proxymodule
# before we can get the grains.
if not salt.utils.is_proxy():
self.opts['grains'] = salt.loader.grains(opts)
# TODO: remove?