valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43168 from rallytime/bp-43041

Browse Source 
Back-port #43041 to 2017.7
This commit is contained in:
garethgreenaway 2017-08-24 12:07:22 -07:00 committed by GitHub
commit 034c325a09
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/pillar/git_pillar.py
View File

@ -561,7 +561,7 @@ def ext_pillar(minion_id, repo, pillar_dirs):
)
for pillar_dir, env in six.iteritems(pillar.pillar_dirs):
# If pillarenv is set, only grab pillars with that match pillarenv
if opts['pillarenv'] and env != opts['pillarenv']:
if opts['pillarenv'] and env != opts['pillarenv'] and env != '__env__':
log.debug(
'env \'%s\' for pillar dir \'%s\' does not match '
'pillarenv \'%s\', skipping',