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

Merge pull request #8282 from cachedout/ssh-opts

Browse Source 
salt-ssh opts
This commit is contained in:
Thomas S Hatch 2013-11-06 14:47:46 -08:00
commit f7e46978eb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,7 +527,8 @@ class Single(object):
self.opts, self.opts,
self.id, self.id,
**self.target) **self.target)
opts_pkg = pre_wrapper['test.opts_pkg']() default_opts = pre_wrapper['test.opts_pkg']()
opts_pkg = dict(default_opts.items() + self.opts.items())
pillar = salt.pillar.Pillar( pillar = salt.pillar.Pillar(
opts_pkg, opts_pkg,
opts_pkg['grains'], opts_pkg['grains'],