saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27388 from basepi/provider.overrides.27209

Browse source 
[2015.8] Fix global provider overrides
This commit is contained in:
Thomas S Hatch 2015-09-25 10:49:03 -06:00
commit db6acfd832
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/loader.py
View file

@ -185,6 +185,8 @@ def minion_mods(
whitelist=whitelist,
loaded_base_name=loaded_base_name)
ret.pack['__salt__'] = ret
# Load any provider overrides from the configuration file providers option
# Note: Providers can be pkg, service, user or group - not to be confused
# with cloud providers.
@ -194,7 +196,7 @@ def minion_mods(
# sometimes providers opts is not to diverge modules but
# for other configuration
try:
funcs = raw_mod(opts, providers[mod], ret.items())
funcs = raw_mod(opts, providers[mod], ret)
except TypeError:
break
else:
@ -203,7 +205,6 @@ def minion_mods(
f_key = '{0}{1}'.format(mod, func[func.rindex('.'):])
ret[f_key] = funcs[func]
ret.pack['__salt__'] = ret
if notify:
evt = salt.utils.event.get_event('minion', opts=opts, listen=False)
evt.fire_event({'complete': True}, tag='/salt/minion/minion_mod_complete')