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

Accept minion_opts from the target information

Browse source 
Rosters can now define minion_opts under the host info
This commit is contained in:
Colton Myers 2015-05-04 14:37:31 -06:00
parent e2099b6e1b
commit 5212c35260
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -519,6 +519,7 @@ class Single(object):
mods=None,
fsclient=None,
thin=None,
minion_opts=None,
**kwargs):
self.opts = opts
self.tty = tty
@ -561,13 +562,15 @@ class Single(object):
'sudo': sudo,
'tty': tty,
'mods': self.mods}
minion_opts = opts.get('ssh_minion_opts', {})
minion_opts.update({
self.minion_opts = opts.get('ssh_minion_opts', {})
if minion_opts is not None:
self.minion_opts.update(minion_opts)
self.minion_opts.update({
'root_dir': os.path.join(self.thin_dir, 'running_data'),
'id': self.id,
'sock_dir': '/',
})
self.minion_config = yaml.dump(minion_opts)
self.minion_config = yaml.dump(self.minion_opts)
self.target = kwargs
self.target.update(args)
self.serial = salt.payload.Serial(opts)