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

Merge pull request #31901 from rallytime/bp-31846

Browse source 
Back-port #31846 to 2015.8
This commit is contained in:
C. R. Oldham 2016-03-15 13:12:43 -06:00
commit 7428c73724
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/minion.py
View file

@ -1379,7 +1379,9 @@ class Minion(MinionBase):
# in the setup process, but we can't load grains for proxies until
# we talk to the device we are proxying for. So force a grains
# sync here.
self.functions['saltutil.sync_grains'](saltenv='base')
# Hmm...We can't seem to sync grains here, makes the event bus go nuts
# leaving this commented to remind future me that this is not a good idea here.
# self.functions['saltutil.sync_grains'](saltenv='base')
else:
self.functions, self.returners, _ = self._load_modules(force_refresh, notify=notify)