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

Add ability to use tagged functions in the same set

Browse source
This commit is contained in:
Bo Maryniuk 2017-07-12 17:12:24 +02:00
parent 81695a9f3c
commit 74689e3462
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/module.py
View file

@ -262,6 +262,7 @@ def run(**kwargs):
missing = []
tests = []
for func in functions:
func = func.split(':')[0]
if func not in __salt__:
missing.append(func)
elif __opts__['test']:
@ -284,8 +285,9 @@ def run(**kwargs):
failures = []
success = []
for func in functions:
_func = func.split(':')[0]
try:
func_ret = _call_function(func, returner=kwargs.get('returner'),
func_ret = _call_function(_func, returner=kwargs.get('returner'),
func_args=kwargs.get(func))
if not _get_result(func_ret, ret['changes'].get('ret', {})):
if isinstance(func_ret, dict):