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

Merge pull request #39286 from terminalmage/fix-pillarenv-precedence

Browse source 
Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
This commit is contained in:
Mike Place 2017-02-09 14:22:45 -07:00 • committed by GitHub
commit 77e50ed8b7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/pillar/__init__.py
View file

@ -372,11 +372,14 @@ class Pillar(object):
opts['grains'] = {}
else:
opts['grains'] = grains
if not opts.get('environment'):
opts['environment'] = saltenv
# Allow minion/CLI saltenv/pillarenv to take precedence over master
opts['environment'] = saltenv \
if saltenv is not None \
else opts.get('environment')
opts['pillarenv'] = pillarenv \
if pillarenv is not None \
else opts.get('pillarenv')
opts['id'] = self.minion_id
if not opts.get('pillarenv'):
opts['pillarenv'] = pillarenv
if opts['state_top'].startswith('salt://'):
opts['state_top'] = opts['state_top']
elif opts['state_top'].startswith('/'):