Remove debug statement. Load utils for all proxies.

This commit is contained in:
C. R. Oldham 2015-08-13 16:16:26 -06:00
parent e6382e3ba6
commit f0a7a3caaf
4 changed files with 7 additions and 6 deletions

View File

@ -22,6 +22,7 @@ import locale
import salt.exceptions
__proxyenabled__ = ['*']
# Extend the default list of supported distros. This will be used for the
# /etc/DISTRO-release checking that is part of platform.linux_distribution()
from platform import _supported_dists

View File

@ -44,9 +44,11 @@ def defaults():
def facts():
log.debug('----------- Trying to get facts')
facts = __opts__['proxymodule']['junos.facts']()
facts['version_info'] = 'override'
return facts
if 'proxymodule' in __opts__:
facts = __opts__['proxymodule']['junos.facts']()
facts['version_info'] = 'override'
return facts
return None
def os_family():

View File

@ -1143,7 +1143,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
#
# Render modules and state modules are OK though
if 'proxymodule' in self.opts:
if self.tag not in ['render', 'states']:
if self.tag not in ['render', 'states', 'utils']:
if not hasattr(mod, '__proxyenabled__') or \
(self.opts['proxymodule'].loaded_base_name not in mod.__proxyenabled__ and
'*' not in mod.__proxyenabled__):

View File

@ -602,9 +602,7 @@ class Minion(MinionBase):
self._connect_master_future = self.connect_master()
# finish connecting to master
self._connect_master_future.add_done_callback(lambda f: self.io_loop.stop())
log.debug("ioloop starting")
self.io_loop.start()
log.debug("ioloop done")
# I made the following 3 line oddity to preserve traceback.
# Please read PR #23978 before changing, hopefully avoiding regressions.
# Good luck, we're all counting on you. Thanks.