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

Safer approach

Browse Source
This commit is contained in:
Mike Place 2015-08-04 16:35:57 -06:00
parent 341c34ed6c
commit 625d03da4f
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/transport/tcp.py
View File

@ -82,7 +82,8 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
@classmethod
def __key(cls, opts, **kwargs):
opts.update(kwargs)
if 'master_uri' in kwargs:
opts['master_uri'] = kwargs['master_uri']
return (opts['pki_dir'], # where the keys are stored
opts['id'], # minion ID
opts['master_uri'], # master ID