valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16170 from thatch45/16165

Browse Source 
Fix the mods path in the shim and pass mods into wfuncs
This commit is contained in:
Thomas S Hatch 2014-09-26 14:22:11 -06:00
commit 0d609ac14e
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/client/ssh/__init__.py
View File

@ -278,6 +278,7 @@ class SSH(object):
self.opts,
argv,
host,
mods=self.mods,
**target)
if salt.utils.which('ssh-copy-id'):
# we have ssh-copy-id, use it!
@ -290,6 +291,7 @@ class SSH(object):
self.opts,
self.opts['argv'],
host,
mods=self.mods,
**target)
stdout, stderr, retcode = single.cmd_block()
try:
@ -639,6 +641,7 @@ class Single(object):
pre_wrapper = salt.client.ssh.wrapper.FunctionWrapper(
self.opts,
self.id,
mods=self.mods,
**self.target)
opts_pkg = pre_wrapper['test.opts_pkg']()
opts_pkg['file_roots'] = self.opts['file_roots']
@ -687,6 +690,7 @@ class Single(object):
wrapper = salt.client.ssh.wrapper.FunctionWrapper(
opts,
self.id,
mods=self.mods,
**self.target)
self.wfuncs = salt.loader.ssh_wrapper(opts, wrapper, self.opts)
wrapper.wfuncs = self.wfuncs
@ -961,9 +965,9 @@ def mod_data(opts):
pl_dir = os.path.join(path, '_{0}'.format(ref))
if os.path.isdir(pl_dir):
for fn_ in os.listdir(pl_dir):
if not os.path.isfile(fn_):
continue
mod_path = os.path.join(pl_dir, fn_)
if not os.path.isfile(mod_path):
continue
with open(mod_path) as fp_:
code_str = fp_.read().encode('base64')
mod_str += '{0}|{1},'.format(fn_, code_str)

1
salt/client/ssh/ssh_py_shim.py
View File

@ -162,7 +162,6 @@ def write_modules():
'var',
'cache',
'salt',
'minion',
'extmods')
for mtype in mtypes:
dest_dir = os.path.join(modcache, mtype)

6
salt/client/ssh/wrapper/__init__.py
View File

@ -25,10 +25,15 @@ class FunctionWrapper(dict):
id_,
host,
wfuncs=None,
mods=None,
**kwargs):
super(FunctionWrapper, self).__init__()
self.wfuncs = wfuncs if isinstance(wfuncs, dict) else {}
self.opts = opts
if isinstance(mods, dict):
self.mods = mods
else:
self.mods = {}
self.kwargs = {'id_': id_,
'host': host}
self.kwargs.update(kwargs)
@ -50,6 +55,7 @@ class FunctionWrapper(dict):
single = salt.client.ssh.Single(
self.opts,
argv,
mods=self.mods,
**self.kwargs
)
stdout, stderr, _ = single.cmd_block()