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

Merge pull request #34994 from rallytime/bp-34835

Browse Source 
Back-port #34835 to 2015.8
This commit is contained in:
Nicole Thomas 2016-07-27 12:21:10 -06:00 committed by GitHub
commit 837bc6ba7d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/client/ssh/wrapper/mine.py
View File

@ -36,7 +36,9 @@ def get(tgt, fun, expr_form='glob', roster='flat'):
salt-ssh '*' mine.get '192.168.5.0' network.ipaddrs roster=scan
'''
# Set up opts for the SSH object
opts = copy.deepcopy(__opts__)
opts = copy.deepcopy(__context__['master_opts'])
minopts = copy.deepcopy(__opts__)
opts.update(minopts)
if roster:
opts['roster'] = roster
opts['argv'] = [fun]

4
salt/client/ssh/wrapper/publish.py
View File

@ -72,7 +72,9 @@ def _publish(tgt,
arg = []
# Set up opts for the SSH object
opts = copy.deepcopy(__opts__)
opts = copy.deepcopy(__context__['master_opts'])
minopts = copy.deepcopy(__opts__)
opts.update(minopts)
if roster:
opts['roster'] = roster
if timeout: