Merge pull request #18812 from cro/proxy_logic_fix

Fix logic error introduced sometime in the past 6 months that prevented ...

salt/loader.py

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

salt/modules/sysmod.py

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