valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38254 from terminalmage/check-pillarenv

Browse Source 
Also check if pillarenv is in opts
This commit is contained in:
Mike Place 2016-12-15 02:10:24 -07:00 committed by GitHub
commit 3c718ed35e
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/__init__.py
View File

@ -351,7 +351,7 @@ class Pillar(object):
if not opts.get('environment'):
opts['environment'] = saltenv
opts['id'] = self.minion_id
if 'pillarenv' not in opts:
if not opts.get('pillarenv'):
opts['pillarenv'] = pillarenv
if opts['state_top'].startswith('salt://'):
opts['state_top'] = opts['state_top']