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

Fix for #2567

Browse Source
This commit is contained in:
Thomas S Hatch 2012-11-15 16:20:24 -07:00
parent 974b5a8095
commit 7845954ec9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/pillar/__init__.py
View File

@ -70,6 +70,7 @@ class Pillar(object):
self.opts = self.__gen_opts(opts, grains, id_, env)
self.client = salt.fileclient.get_file_client(self.opts)
if opts.get('file_client', '') == 'local':
opts['grains'] = grains
self.functions = salt.loader.minion_mods(opts)
else:
self.functions = salt.loader.minion_mods(self.opts)