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 #22850 from bersace/fix-pillar-salt-mixed

Browse source 
Fix pillar and salt fileserver mixed
This commit is contained in:
Thomas S Hatch 2015-04-21 11:04:33 -06:00
commit fd53889f0e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/state.py
View file

@ -2237,7 +2237,7 @@ class BaseHighState(object):
),
self.state.rend,
self.state.opts['renderer'],
env=self.opts['environment']
saltenv=self.opts['environment']
)
]
else:
@ -2977,9 +2977,9 @@ class HighState(BaseHighState):
def __init__(self, opts, pillar=None, jid=None):
self.opts = opts
self.state = State(self.opts, pillar, jid)
self.client = salt.fileclient.get_file_client(self.opts)
BaseHighState.__init__(self, opts)
self.state = State(self.opts, pillar, jid)
self.matcher = salt.minion.Matcher(self.opts)
# tracks all pydsl state declarations globally across sls files