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

Force a grains sync after we load the proxy's grains.

Browse source
This commit is contained in:
C. R. Oldham 2016-01-12 08:06:33 -07:00
parent 5ecf85017b
commit 144fea02e5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/minion.py
View file

@ -2591,7 +2591,8 @@ class ProxyMinion(Minion):
proxy_init_fn = self.proxy[fq_proxyname+'.init']
proxy_init_fn(self.opts)
self.opts['grains'] = salt.loader.grains(self.opts)
self.opts['grains'] = salt.loader.grains(self.opts, force_refresh=True)
self.functions['saltutil.sync_grains'](saltenv='base')
# Check config 'add_proxymodule_to_opts' Remove this in Boron.
if self.opts['add_proxymodule_to_opts']: