Merge pull request #32588 from alprs/fix-salt_ssh_module_types

Fix salt-ssh module function call argument type juggling by JSON encoding them
saltstack · Apr 18, 2016 · a6a4274 · a6a4274
2 parents 5e7edfc + d912f1c
commit a6a4274
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/client/ssh/wrapper/__init__.py b/salt/client/ssh/wrapper/__init__.py
@@ -103,8 +103,8 @@ def caller(*args, **kwargs):
             The remote execution function
             '''
             argv = [cmd]
-            argv.extend([str(arg) for arg in args])
-            argv.extend(['{0}={1}'.format(key, val) for key, val in six.iteritems(kwargs)])
+            argv.extend([json.dumps(arg) for arg in args])
+            argv.extend(['{0}={1}'.format(key, json.dumps(val)) for key, val in six.iteritems(kwargs)])
             single = salt.client.ssh.Single(
                     self.opts,
                     argv,