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 #35245 from rallytime/bp-35039

Browse source 
Back-port #35039 to 2015.8
This commit is contained in:
Mike Place 2016-08-06 16:52:44 +09:00 • committed by GitHub
commit f6d7360e0b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/module.py
View file

@ -52,6 +52,7 @@ with ``m_``:
* name
* names
* state
* saltenv
For example:
@ -183,6 +184,9 @@ def run(name, **kwargs):
elif arg == 'state':
if 'm_state' in kwargs:
defaults[arg] = kwargs.pop('m_state')
elif arg == 'saltenv':
if 'm_saltenv' in kwargs:
defaults[arg] = kwargs.pop('m_saltenv')
if arg in kwargs:
defaults[arg] = kwargs.pop(arg)
missing = set()
@ -195,6 +199,8 @@ def run(name, **kwargs):
rarg = 'm_names'
elif arg == 'state':
rarg = 'm_state'
elif arg == 'saltenv':
rarg = 'm_saltenv'
else:
rarg = arg
if rarg not in kwargs and arg not in defaults: