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

Merge pull request #22689 from mgwilliams/tcp-key

Browse Source 
make salt-key work with tcp transport
This commit is contained in:
Thomas S Hatch 2015-04-14 19:45:27 -06:00
commit c5f814bfdb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/key.py
View File

@ -37,7 +37,7 @@ log = logging.getLogger(__name__)
def get_key(opts): def get_key(opts):
if opts['transport'] == 'zeromq': if opts['transport'] in ('zeromq', 'tcp'):
return Key(opts) return Key(opts)
else: else:
return RaetKey(opts) return RaetKey(opts)
@ -49,7 +49,7 @@ class KeyCLI(object):
''' '''
def __init__(self, opts): def __init__(self, opts):
self.opts = opts self.opts = opts
if self.opts['transport'] == 'zeromq': if self.opts['transport'] in ('zeromq', 'tcp'):
self.key = Key(opts) self.key = Key(opts)
else: else:
self.key = RaetKey(opts) self.key = RaetKey(opts)
@ -650,7 +650,7 @@ class Key(object):
# We have to differentiate between RaetKey._check_minions_directories # We have to differentiate between RaetKey._check_minions_directories
# and Zeromq-Keys. Raet-Keys only have three states while ZeroMQ-keys # and Zeromq-Keys. Raet-Keys only have three states while ZeroMQ-keys
# havd an additional 'denied' state. # havd an additional 'denied' state.
if self.opts['transport'] == 'zeromq': if self.opts['transport'] in ('zeromq', 'tcp'):
key_dirs = self._check_minions_directories() key_dirs = self._check_minions_directories()
else: else:
key_dirs = self._check_minions_directories() key_dirs = self._check_minions_directories()

2
salt/output/key.py
View File

@ -24,7 +24,7 @@ def output(data):
ident = 0 ident = 0
if __opts__.get('__multi_key'): if __opts__.get('__multi_key'):
ident = 4 ident = 4
if __opts__['transport'] == 'zeromq': if __opts__['transport'] in ('zeromq', 'tcp'):
acc = 'minions' acc = 'minions'
pend = 'minions_pre' pend = 'minions_pre'
den = 'minions_denied' den = 'minions_denied'