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

Fix #2240

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-17 19:16:04 -06:00
parent 5ef188dbec
commit ca42e02641
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/pillar/__init__.py
View File

@ -70,15 +70,18 @@ class Pillar(object):
self.opts = self.__gen_opts(opts, grains, id_, env)
self.client = salt.fileclient.get_file_client(self.opts)
self.matcher = salt.minion.Matcher(self.opts)
self.functions = salt.loader.minion_mods(self.opts)
if opts['file_client'] == 'local':
self.functions = salt.loader.minion_mods(opts)
else:
self.functions = salt.loader.minion_mods(self.opts)
self.rend = salt.loader.render(self.opts, self.functions)
self.ext_pillars = salt.loader.pillars(self.opts, self.functions)
def __gen_opts(self, opts, grains, id_, env=None):
def __gen_opts(self, opts_in, grains, id_, env=None):
'''
The options need to be altered to conform to the file client
'''
opts = copy.deepcopy(opts)
opts = dict(opts_in)
opts['file_roots'] = opts['pillar_roots']
opts['file_client'] = 'local'
opts['grains'] = grains