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

Merge pull request #7387 from terminalmage/loader_fix

Browse Source 
Fix cross-calling provider overrides
This commit is contained in:
Pedro Algarvio 2013-09-21 08:13:22 -07:00
commit f041137e22
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/loader.py
View File

@ -97,19 +97,11 @@ def minion_mods(opts, context=None, whitelist=None):
whitelist = opts.get('whitelist_modules', None)
functions = load.gen_functions(
pack,
whitelist=whitelist
whitelist=whitelist,
provider_overrides=True
)
# Enforce dependencies of module functions from "functions"
Depends.enforce_dependencies(functions)
if opts.get('providers', False):
if isinstance(opts['providers'], dict):
for mod, provider in opts['providers'].items():
funcs = raw_mod(opts, provider, functions)
if funcs:
for func in funcs:
f_key = '{0}{1}'.format(mod, func[func.rindex('.'):])
functions[f_key] = funcs[func]
return functions
@ -561,7 +553,8 @@ class Loader(object):
mod.__context__ = context
return funcs
def gen_functions(self, pack=None, virtual_enable=True, whitelist=None):
def gen_functions(self, pack=None, virtual_enable=True, whitelist=None,
provider_overrides=False):
'''
Return a dict of functions found in the defined module_dirs
'''
@ -844,6 +837,18 @@ class Loader(object):
)
self._apply_outputter(func, mod)
# Handle provider overrides
if provider_overrides and self.opts.get('providers', False):
if isinstance(self.opts['providers'], dict):
for mod, provider in self.opts['providers'].items():
newfuncs = raw_mod(self.opts, provider, funcs)
if newfuncs:
for newfunc in newfuncs:
f_key = '{0}{1}'.format(
mod, newfunc[newfunc.rindex('.'):]
)
funcs[f_key] = newfuncs[newfunc]
# now that all the functions have been collected, iterate back over
# the available modules and inject the special __salt__ namespace that
# contains these functions.