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

Instantiate the SaltCacheLoader's fileclient in the __init__

Browse Source 
This fixes an edge case when orchestration attempts to compile pillar
data before making any other fileclient requests.
This commit is contained in:
Erik Johnson 2018-02-21 17:13:50 -06:00 committed by rallytime
parent d2e26c38ca
commit a8cded1c83
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/jinja.py
View File

@ -67,9 +67,11 @@ class SaltCacheLoader(BaseLoader):
else: else:
self.searchpath = [os.path.join(opts['cachedir'], 'files', saltenv)] self.searchpath = [os.path.join(opts['cachedir'], 'files', saltenv)]
log.debug('Jinja search path: %s', self.searchpath) log.debug('Jinja search path: %s', self.searchpath)
self._file_client = None
self.cached = [] self.cached = []
self.pillar_rend = pillar_rend self.pillar_rend = pillar_rend
self._file_client = None
# Instantiate the fileclient
self.file_client()
def file_client(self): def file_client(self):
''' '''