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

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.proxy[fq_proxyname+'.init']
proxy_init_fn(self.opts) 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. # Check config 'add_proxymodule_to_opts' Remove this in Boron.
if self.opts['add_proxymodule_to_opts']: if self.opts['add_proxymodule_to_opts']: