Further work on __proxy__

salt/loader.py

@@ -181,7 +181,6 @@ def minion_mods(
         utils = {}
     if proxy is None:
         proxy = {}
-
     if not whitelist:
         whitelist = opts.get('whitelist_modules', None)
     ret = LazyLoader(_module_dirs(opts, 'modules', 'module'),
@@ -261,6 +260,7 @@ def proxy(opts, functions=None, returners=None, whitelist=None):
     '''
     Returns the proxy module for this salt-proxy-minion
     '''
+    # This is where we should set directories so proxy modules can be loaded from /srv/<something>
     ret = LazyLoader(_module_dirs(opts, 'proxy', 'proxy'),
                      opts,
                      tag='proxy',

salt/minion.py

@@ -2541,9 +2541,9 @@ 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
+        # 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()

salt/modules/rest_service.py

@@ -44,6 +44,19 @@ def get_all():
     return __proxy__[proxy_fn]()
 
 
+def list_():
+    '''
+    Return a list of all available services
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' service.list
+    '''
+    return get_all()
+
+
 def list_():
     '''
     Return a list of all available services.