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 #25239 from DSRCompany/pillarenv_CR_bugfixes

Browse source 
Minor bugfixes in pillarenv support
This commit is contained in:
Thomas S Hatch 2015-07-09 19:25:24 -06:00
commit 768df4bf17
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/minion.py
View file

@ -630,7 +630,7 @@ class Minion(MinionBase):
self.opts['grains'],
self.opts['id'],
self.opts['environment'],
self.opts.get('pillarenv')
pillarenv=self.opts.get('pillarenv')
).compile_pillar()
self.functions, self.returners, self.function_errors = self._load_modules()
self.serial = salt.payload.Serial(self.opts)

2
salt/pillar/__init__.py
View file

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