valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix jinja search path for local file_client"

Browse Source
This commit is contained in:
Thomas S Hatch 2014-12-09 14:34:45 -07:00
parent e14d524b53
commit 1e71344a98
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/jinja.py
View File

@ -64,7 +64,10 @@ class SaltCacheLoader(BaseLoader):
self.opts = opts
self.saltenv = saltenv
self.encoding = encoding
self.searchpath = [path.join(opts['cachedir'], 'files', saltenv)]
if opts.get('file_client', 'remote') == 'local':
self.searchpath = opts['file_roots'][saltenv]
else:
self.searchpath = [path.join(opts['cachedir'], 'files', saltenv)]
log.debug('Jinja search path: {0!r}'.format(self.searchpath))
self._file_client = None
self.cached = []