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 #46450 from gtmanfred/salt_runner

Browse source 
load grains for salt.cmd runner
This commit is contained in:
Nicole Thomas 2018-03-12 14:52:22 -04:00 • committed by GitHub
commit b11a8fc8e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/runners/salt.py
View file

@ -32,11 +32,12 @@ Execution modules are also available to salt runners:
# import python libs
from __future__ import absolute_import
from __future__ import print_function
import copy
import logging
# import salt libs
import salt.client
from salt.loader import minion_mods, utils
import salt.loader
from salt.exceptions import SaltClientError
log = logging.getLogger(__name__) # pylint: disable=invalid-name
@ -64,9 +65,11 @@ def cmd(fun, *args, **kwargs):
kws = dict((k, v) for k, v in kwargs.items() if not k.startswith('__'))
# pylint: disable=undefined-variable
return minion_mods(
__opts__,
utils=utils(__opts__)).get(fun)(*args, **kws)
opts = copy.deepcopy(__opts__)
opts['grains'] = salt.loader.grains(opts)
utils = salt.loader.utils(opts)
mods = salt.loader.minion_mods(opts, utils=utils)
return mods.get(fun)(*args, **kws)
def execute(tgt,