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

Take into account __env__ and saltenv being passed from state files.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-11-06 23:10:42 +00:00
parent 6e76123a0f
commit f19ad9bd9d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/state.py
View File

@ -1275,9 +1275,11 @@ class State(object):
# format_call
env = cdata['kwargs']['env']
elif '__env__' in data:
# The user is passing an alternative environement using the
# proper keyword argument
# The user is passing an alternative environment using __env__
# which is also not the appropriate choice, still, handle it
env = data['__env__']
elif 'saltenv' in data:
env = data['saltenv']
else:
# Let's use the default environment
env = 'base'