Merge pull request #42470 from rallytime/bp-42031

Back-port #42031 to 2017.7.1
2025-04-17 10:10:20 +00:00 · 2017-07-24 08:09:28 -07:00 · 2017-07-24 08:09:28 -07:00 · 09766bccbc
commit 09766bccbc
parent d7b172a15b 0a0c6287a4
1 changed files with 3 additions and 1 deletions
--- a/salt/state.py
+++ b/salt/state.py
@ -577,6 +577,8 @@ class Compiler(object):
                if '__env__' in body:
                    chunk['__env__'] = body['__env__']
                chunk['__id__'] = name
+                chunk['arg'] = []
+                chunk['kwarg'] = {}
                for arg in run:
                    if isinstance(arg, six.string_types):
                        funcs.add(arg)
@ -589,7 +591,7 @@ class Compiler(object):
                                        names.append(_name)
                                continue
                            else:
-                                chunk.update(arg)
+                                chunk['kwarg'].update(arg)
                if names:
                    name_order = 1
                    for entry in names: