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

Merge pull request #28834 from cachedout/tcp_revert_master_uri

Browse source 
Fix breakage in tcp server
This commit is contained in:
Mike Place 2015-11-12 11:57:18 -07:00
commit 560671a170
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/transport/tcp.py
View file

@ -82,9 +82,11 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
@classmethod
def __key(cls, opts, **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
kwargs.get('master_uri') or opts.get('master_uri'), # master ID
opts['master_uri'],
kwargs.get('crypt', 'aes'), # TODO: use the same channel for crypt
)