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

__proxy__ is getting nuked somewhere

Browse source
This commit is contained in:
C. R. Oldham 2015-10-07 09:37:10 -06:00
parent bdffb9f57b
commit 64f967d731
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/minion.py
View file

@ -2520,10 +2520,6 @@ class ProxyMinion(Minion):
# Then load the proxy module
self.proxy = salt.loader.proxy(self.opts)
# Check config 'add_proxymodule_to_opts' Default to False in Boron
if self.opts['add_proxymodule_to_opts']:
self.opts['proxymodule'] = self.proxy
# And re-load the modules so the __proxy__ variable gets injected
self.functions, self.returners, self.function_errors = self._load_modules(proxy=self.proxy)
self.functions.pack['__proxy__'] = self.proxy
@ -2541,6 +2537,10 @@ class ProxyMinion(Minion):
proxy_init_fn(self.opts)
self.opts['grains'] = salt.loader.grains(self.opts)
# # Check config 'add_proxymodule_to_opts' Remove this in Boron.
# if self.opts['add_proxymodule_to_opts']:
# self.opts['proxymodule'] = self.proxy
self.serial = salt.payload.Serial(self.opts)
self.mod_opts = self._prep_mod_opts()
self.matcher = Matcher(self.opts, self.functions)