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

Merge pull request #18812 from cro/proxy_logic_fix

Browse Source 
Fix logic error introduced sometime in the past 6 months that prevented ...
This commit is contained in:
Thomas S Hatch 2014-12-09 14:39:16 -07:00
commit 7993f5c826
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/loader.py
View File

@ -725,8 +725,8 @@ class Loader(object):
# This is a proxy minion but this module doesn't support proxy # This is a proxy minion but this module doesn't support proxy
# minions at all # minions at all
continue continue
if not self.opts['proxy']['proxytype'] in mod.__proxyenabled__ or \ if not (self.opts['proxy']['proxytype'] in mod.__proxyenabled__ or
'*' in mod.__proxyenabled__: '*' in mod.__proxyenabled__):
# This is a proxy minion, this module supports proxy # This is a proxy minion, this module supports proxy
# minions, but not this particular minion # minions, but not this particular minion
log.debug(mod) log.debug(mod)
@ -820,6 +820,7 @@ class Loader(object):
''' '''
Loads all of the modules from module_dirs and returns a list of them Loads all of the modules from module_dirs and returns a list of them
''' '''
self.modules = [] self.modules = []
log.trace('loading {0} in {1}'.format(self.tag, self.module_dirs)) log.trace('loading {0} in {1}'.format(self.tag, self.module_dirs))

2
salt/modules/sysmod.py
View File

@ -17,6 +17,8 @@ log = logging.getLogger(__name__)
# Define the module's virtual name # Define the module's virtual name
__virtualname__ = 'sys' __virtualname__ = 'sys'
__proxyenabled__ = '*'
def __virtual__(): def __virtual__():
''' '''