saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pillar.items pillar_env & pillar_override are never used

Browse source 
Fixes a few bugs in pillar_env determination and pillar_enc decryption
This commit is contained in:
Ronald van Zantvoort 2017-07-19 13:24:15 +02:00 • committed by GitHub
parent a175c40c1d
commit 664f4b577b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/pillar.py
View file

@ -257,8 +257,8 @@ def items(*args, **kwargs):
__opts__,
__grains__,
__opts__['id'],
pillar_override=kwargs.get('pillar'),
pillarenv=kwargs.get('pillarenv') or __opts__['pillarenv'])
pillar_override=pillar_override,
pillarenv=pillarenv)
return pillar.compile_pillar()