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

More proxy minion updates

Browse source
This commit is contained in:
C. R. Oldham 2015-08-06 15:46:49 -06:00
parent e79a182108
commit 37de6af686
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/loader.py
View file

@ -1036,9 +1036,6 @@ class LazyLoader(salt.utils.lazy.LazyDict):
#
# Render modules and state modules are OK though
if 'proxy' in self.opts:
log.debug('self.tag is {}'.format(self.tag))
# import pydevd
# pydevd.settrace('172.16.207.1', port=65500, stdoutToServer=True, stderrToServer=True)
if self.tag not in ['render', 'states']:
if not hasattr(mod, '__proxyenabled__') or \
(self.opts['proxy']['proxytype'] not in mod.__proxyenabled__ and

4
salt/minion.py
View file

@ -2947,7 +2947,7 @@ class ProxyMinion(Minion):
# log.debug('{0}'.format(self.proxymodule['init']))
opts['proxymodule'] = self.proxymodule
opts['grains'] = salt.loader.grains(opts)
opts['id'] = opts['proxymodule'][fq_proxyname+'.id']()
opts['id'] = opts['proxymodule'][fq_proxyname+'.id'](opts)
opts.update(resolve_dns(opts))
self.opts = opts
self.authenticate(timeout, safe)
@ -2958,7 +2958,7 @@ class ProxyMinion(Minion):
opts['environment'],
pillarenv=opts.get('pillarenv'),
).compile_pillar()
opts['proxymodule'][fq_proxyname+'.init']()
opts['proxymodule'][fq_proxyname+'.init'](opts)
self.functions, self.returners, self.function_errors = self._load_modules()
self.serial = salt.payload.Serial(self.opts)
self.mod_opts = self._prep_mod_opts()