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

Clean up flo zmq deed, since we have changed the MWorker

Browse Source
This commit is contained in:
Thomas Jackson 2015-04-08 08:16:37 -07:00
parent 7a3cca4202
commit e0e8868530
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/daemons/flo/zero.py
View File

@ -223,7 +223,6 @@ class SaltZmqWorker(ioflo.base.deeding.Deed):
The zeromq behavior for the workers
'''
Ioinits = {'opts': '.salt.opts',
'mkey': '.salt.var.zmq.master_key',
'key': '.salt.access_keys',
'aes': '.salt.var.zmq.aes'}
@ -242,7 +241,6 @@ class SaltZmqWorker(ioflo.base.deeding.Deed):
crypticle = salt.crypt.Crypticle(self.opts.value, self.aes.value)
self.worker = salt.master.FloMWorker(
self.opts.value,
self.mkey.value,
self.key.value,
crypticle)
self.worker.setup()

3
salt/master.py
View File

@ -2081,10 +2081,9 @@ class FloMWorker(MWorker):
'''
def __init__(self,
opts,
mkey,
key,
):
MWorker.__init__(self, opts, mkey, key)
MWorker.__init__(self, opts, key)
def setup(self):
'''