saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use the custom yaml serializer for minion_opts for salt-ssh

Browse source 
Without this change, any OrderedDict instances in our minion_opts (in
this case from grains) would be serialized to a format that
yaml.safe_load couldn't load. Configuration parsing would error out.
This commit is contained in:
Colton Myers 2015-09-30 13:58:54 -06:00
parent a4a53ecff5
commit 0785438b3f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/client/ssh/__init__.py
View file

@ -32,6 +32,7 @@ import salt.log
import salt.loader
import salt.minion
import salt.roster
import salt.serializers.yaml
import salt.state
import salt.utils
import salt.utils.args
@ -655,7 +656,7 @@ class Single(object):
'sock_dir': '/',
'log_file': 'salt-call.log'
})
self.minion_config = yaml.dump(self.minion_opts)
self.minion_config = salt.serializers.yaml.serialize(self.minion_opts)
self.target = kwargs
self.target.update(args)
self.serial = salt.payload.Serial(opts)