Merge pull request #34994 from rallytime/bp-34835

Back-port #34835 to 2015.8
saltstack · Jul 27, 2016 · 837bc6b · 837bc6b
2 parents b58c663 + 9268a79
commit 837bc6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/salt/client/ssh/wrapper/mine.py b/salt/client/ssh/wrapper/mine.py
@@ -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]

diff --git a/salt/client/ssh/wrapper/publish.py b/salt/client/ssh/wrapper/publish.py
@@ -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: