Allow proxy minion types to be dynamically loaded #50183
Conversation
ghost
self-requested a review
| if not opts: | ||
| ckminions = salt.utils.minions.CkMinions(__opts__) | ||
| else: | ||
| ckminions = salt.utils.minions.CkMinions(opts) |
There was a problem hiding this comment.
can we just make this ckminions = salt.utils.minions.CkMinions(opts or __opts__) and get rid of the rest of the if statement?
salt/matchers/cache_match.py
Outdated
| if not opts: | ||
| ckminions = salt.utils.minions.CkMinions(__opts__) | ||
| else: | ||
| ckminions = salt.utils.minions.CkMinions(opts) |
|
@cro This has several lint failures as well as some test failures. Can you take a look? |
|
@cro Still some proxy test failures here, I'm afraid. https://jenkinsci.saltstack.com/job/pr-kitchen-ubuntu1604-py2/job/PR-50183/7/ |
|
Yes, looks like they are related to the ProxyCaller. I am looking more closely at it now. |
cro
force-pushed
the
metaproxy
branch
2 times, most recently
from
796ce64 to
d4c15f7
Compare
cro
force-pushed
the
metaproxy
branch
3 times, most recently
from
174e1de to
e35eb6a
Compare
cro
force-pushed
the
metaproxy
branch
2 times, most recently
from
a89d442 to
12c147a
Compare
| if not opts: | ||
| opts = __opts__ | ||
| nodegroups = opts.get('nodegroups', {}) | ||
| matchers = salt.loader.matchers(opts) |
There was a problem hiding this comment.
If you added a __matchers__ dunder to the packed items, similar to what we do for __salt__ in minion_mods, then you don't need to instantiate a new LazyLoader here. I get that we might still need to do it, in cases where actual opts are passed in, but it shouldn't be necessary in most cases.
[2019.2.1] Porting metaproxy changes in #50183 to 2019.2.1
What does this PR do?
This PR creates a new loadable module type called a
metaproxyand abstracts the existing proxy minion to become a type of metaproxy. This enables us to build different types of proxy minions that can still load existing proxymodules.Tests written?
No, but existing tests for proxy minions pass successfully.
Commits signed with GPG?
Yes