valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make masterminion class accept whitelist

Browse Source
This commit is contained in:
Thomas S Hatch 2012-12-20 16:51:52 -07:00
parent 7928f2261c
commit cec7b43139
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/minion.py
View File

@ -134,7 +134,8 @@ class MasterMinion(object):
returners=True,
states=True,
rend=True,
matcher=True):
matcher=True,
whitelist=None):
self.opts = opts
self.opts['grains'] = salt.loader.grains(opts)
self.opts['pillar'] = {}
@ -148,7 +149,9 @@ class MasterMinion(object):
'''
Load all of the modules for the minion
'''
self.functions = salt.loader.minion_mods(self.opts)
self.functions = salt.loader.minion_mods(
self.opts,
whitelist=whitelist)
if self.mk_returners:
self.returners = salt.loader.returners(self.opts, self.functions)
if self.mk_states: