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

Merge pull request #39232 from terminalmage/issue21342

Browse Source 
Avoid recursion in s3/svn ext_pillars
This commit is contained in:
Mike Place 2017-02-08 12:33:27 -07:00 committed by GitHub
commit ddcff89a84
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/pillar/s3.py
View File

@ -172,7 +172,7 @@ def ext_pillar(minion_id,
pil = Pillar(opts, __grains__, minion_id, environment)
compiled_pillar = pil.compile_pillar()
compiled_pillar = pil.compile_pillar(ext=False)
return compiled_pillar

2
salt/pillar/svn_pillar.py
View File

@ -193,4 +193,4 @@ def ext_pillar(minion_id,
opts = deepcopy(__opts__)
opts['pillar_roots'][branch] = [pillar_dir]
pil = Pillar(opts, __grains__, minion_id, branch)
return pil.compile_pillar()
return pil.compile_pillar(ext=False)