File 0065-fix-beacon-list-to-include-all-beacons-bei... of Package salt.3314

Overview Repositories Revisions Requests Users Attributes Meta

File 0065-fix-beacon-list-to-include-all-beacons-being-process.patch of Package salt.3314

From 401d2f13a1a207693bc5f6f98d3dda20832fa71b Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Wed, 20 Jul 2016 12:57:33 -0600
Subject: [PATCH 65/65] fix beacon list to include all beacons being processed

Don't discard running beacons config when listing becaons

Refs #34827
---
 salt/beacons/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/salt/beacons/__init__.py b/salt/beacons/__init__.py
index 492469d..b90a2d9 100644
--- a/salt/beacons/__init__.py
+++ b/salt/beacons/__init__.py
@@ -22,6 +22,7 @@ class Beacon(object):
     '''
     def __init__(self, opts, functions):
         self.opts = opts
+        self.functions = functions
         self.beacons = salt.loader.beacons(opts, functions)
         self.interval_map = dict()
 
@@ -132,6 +133,8 @@ class Beacon(object):
         '''
         # Fire the complete event back along with the list of beacons
         evt = salt.utils.event.get_event('minion', opts=self.opts)
+        b_conf = self.functions['config.merge']('beacons')
+        self.opts['beacons'].update(b_conf)
         evt.fire_event({'complete': True, 'beacons': self.opts['beacons']},
                        tag='/salt/minion/minion_beacons_list_complete')
 
-- 
2.8.2

Places

File 0065-fix-beacon-list-to-include-all-beacons-being-process.patch of Package salt.3314

Places