mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Merge pull request #26515 from bersace/salt-env-local-sls
Defaults to current saltenv in state.sls
This commit is contained in:
commit
4532f98a76
@ -354,7 +354,7 @@ def highstate(test=None,
|
||||
|
||||
|
||||
def sls(mods,
|
||||
saltenv='base',
|
||||
saltenv=None,
|
||||
test=None,
|
||||
exclude=None,
|
||||
queue=False,
|
||||
@ -411,6 +411,9 @@ def sls(mods,
|
||||
# Backwards compatibility
|
||||
saltenv = env
|
||||
|
||||
if saltenv is None:
|
||||
saltenv = __opts__['environment'] or 'base'
|
||||
|
||||
if queue:
|
||||
_wait(kwargs.get('__pub_jid'))
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user