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

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