From 8baf83a61f996687530e9161e67d809443d347d9 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Mon, 2 Mar 2015 14:11:58 -0700
Subject: [PATCH] Send execution modules into the beacons system

---
 salt/daemons/flo/core.py | 7 +++++--
 salt/minion.py           | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/salt/daemons/flo/core.py b/salt/daemons/flo/core.py
index 833acf2029..ed44ca5c44 100644
--- a/salt/daemons/flo/core.py
+++ b/salt/daemons/flo/core.py
@@ -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):
diff --git a/salt/minion.py b/salt/minion.py
index d4c9494603..e9c77503f7 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -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(