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

Send execution modules into the beacons system

Browse Source
This commit is contained in:
Thomas S Hatch 2015-03-02 14:11:58 -07:00
parent dff484cdfe
commit 8baf83a61f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/daemons/flo/core.py
View File

@ -1656,13 +1656,16 @@ class SaltRaetSetupBeacon(ioflo.base.deeding.Deed):
Create the Beacon subsystem
'''
Ioinits = {'opts': '.salt.opts',
'beacon': '.salt.beacon'}
'beacon': '.salt.beacon',
'modules': '.salt.loader.modules'}
def action(self):
'''
Run the beacons
'''
self.beacon.value = salt.beacons.Beacon(self.opts.value)
self.beacon.value = salt.beacons.Beacon(
self.opts.value,
self.modules.value)
class SaltRaetBeacon(ioflo.base.deeding.Deed):

2
salt/minion.py
View File

@ -353,7 +353,6 @@ class SMinion(object):
class MinionBase(object):
def __init__(self, opts):
self.opts = opts
self.beacons = salt.beacons.Beacon(opts)
def _init_context_and_poller(self):
self.context = zmq.Context()
@ -691,6 +690,7 @@ class Minion(MinionBase):
self.serial = salt.payload.Serial(self.opts)
self.mod_opts = self._prep_mod_opts()
self.matcher = Matcher(self.opts, self.functions)
self.beacons = salt.beacons.Beacon(opts, self.functions)
uid = salt.utils.get_uid(user=opts.get('user', None))
self.proc_dir = get_proc_dir(opts['cachedir'], uid=uid)
self.schedule = salt.utils.schedule.Schedule(