valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inject local minion config into shim if available

Browse Source
This commit is contained in:
Colton Myers 2015-05-01 12:24:57 -06:00
parent 83ef7cb114
commit b751a7281c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/client/ssh/__init__.py
View File

@ -561,12 +561,16 @@ class Single(object):
'sudo': sudo, 'sudo': sudo,
'tty': tty, 'tty': tty,
'mods': self.mods} 'mods': self.mods}
self.minion_config = yaml.dump( minion_config_file = os.path.join(opts.get('config_dir', '/etc/salt'),
{ 'minion')
minion_opts = salt.config.load_config(minion_config_file,
'SALT_MINION_CONFIG')
minion_opts.update({
'root_dir': os.path.join(self.thin_dir, 'running_data'), 'root_dir': os.path.join(self.thin_dir, 'running_data'),
'id': self.id, 'id': self.id,
'sock_dir': '/', 'sock_dir': '/',
}, width=1000).strip() })
self.minion_config = yaml.dump(minion_opts, width=1000).strip()
self.target = kwargs self.target = kwargs
self.target.update(args) self.target.update(args)
self.serial = salt.payload.Serial(opts) self.serial = salt.payload.Serial(opts)