From 6b6b74262c40549c3001dd56f09ba0fc7ba8ffa8 Mon Sep 17 00:00:00 2001 From: ptitdoc Date: Wed, 3 May 2017 15:32:50 +0200 Subject: [PATCH] Fix merge order of options in run_wfunc (fix mine.get issues) This fix issues with mine.get when using salt-ssh (https://github.com/saltstack/salt/issues/36796) The dict merge order matters and master_opts needs to take precedence in order to mine.get over salt-ssh to work properly. --- salt/client/ssh/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py index edf9189816fd..aa46ad6c8574 100644 --- a/salt/client/ssh/__init__.py +++ b/salt/client/ssh/__init__.py @@ -922,8 +922,8 @@ def run_wfunc(self): opts_pkg['grains'][grain] = self.target['grains'][grain] popts = {} - popts.update(opts_pkg['__master_opts__']) popts.update(opts_pkg) + popts.update(opts_pkg['__master_opts__']) pillar = salt.pillar.Pillar( popts, opts_pkg['grains'],