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

Fix missing saltenv and pillarenv in pillar.item

Browse source 
Fixes #36153
This commit is contained in:
GLOBAL\i039818 2018-03-14 14:58:45 +01:00
parent 083846fe0e
commit 267ae9f633
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/pillar.py
View file

@ -373,10 +373,16 @@ def item(*args, **kwargs):
ret = {}
default = kwargs.get('default', '')
delimiter = kwargs.get('delimiter', DEFAULT_TARGET_DELIM)
pillarenv = kwargs.get('pillarenv', None)
saltenv = kwargs.get('saltenv', None)
pillar_dict = __pillar__ \
if all(x is None for x in (saltenv, pillarenv)) \
else items(saltenv=saltenv, pillarenv=pillarenv)
try:
for arg in args:
ret[arg] = salt.utils.traverse_dict_and_list(__pillar__,
ret[arg] = salt.utils.traverse_dict_and_list(pillar_dict,
arg,
default,
delimiter)