From 6b6c5ff278705cb421d31504981d7cacdafa83c1 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Wed, 20 Jul 2016 15:20:22 -0600 Subject: [PATCH 1/2] Fix the mine in salt ssh --- salt/client/ssh/wrapper/mine.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/client/ssh/wrapper/mine.py b/salt/client/ssh/wrapper/mine.py index 224ec35214c0..3ad815b3eb2c 100644 --- 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] From 1d2477df05829b4d867875c17ff7aac57aa03c87 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Wed, 20 Jul 2016 15:21:06 -0600 Subject: [PATCH 2/2] same thing for the mine in salt-ssh --- salt/client/ssh/wrapper/publish.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/client/ssh/wrapper/publish.py b/salt/client/ssh/wrapper/publish.py index d703b1d65c07..a2e431b9ffde 100644 --- 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: