Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make the Salt Proxy environment aware
The Salt proxy minion is looking for proxy minion modules in salt://_proxy/. It does so however only in the default "base" environment. On setups which do not use "base" or shall be executed in a different environment this breaks: /etc/salt/master: ... file_roots: noc: - /srv/salt ... $ grep "proxyenabled" /srv/salt/_proxy/junos_manager.py __proxyenabled__ = ['junos_manager'] $ salt-proxy --proxyid=dev1 -l debug ... [DEBUG ] rest_sample proxy __virtual__() called... [INFO ] ssh_sample proxy __virtual__() called... [DEBUG ] Could not LazyLoad junos_manager.grains [DEBUG ] Could not LazyLoad junos_manager.init [ERROR ] Proxymodule junos_manager is missing an init() or a shutdown() or both. Check your proxymodule. Salt-proxy aborted. [WARNING ] Stopping the Salt Proxy Minion [ERROR ] -1 [INFO ] The proxy minion is shutting down.. [INFO ] The Salt ProxyMinion is shut down This is because the loader only looks for _proxy modules in the "base" environment. This commit fixes this (but might possibly break other things, though I did not find side-effects) Initial pull request: saltstack#36704 Forwarded: saltstack#55932 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
- Loading branch information