Don't discard running beacons config when listing becaons (#35174)

Refs #34827
saltstack · Aug 3, 2016 · 67d8dd0 · 67d8dd0
1 parent 3754550
commit 67d8dd0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/salt/beacons/__init__.py b/salt/beacons/__init__.py
@@ -140,7 +140,8 @@ def list_beacons(self):
         # 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')
-        evt.fire_event({'complete': True, 'beacons': b_conf},
+        self.opts['beacons'].update(b_conf)
+        evt.fire_event({'complete': True, 'beacons': self.opts['beacons']},
                        tag='/salt/minion/minion_beacons_list_complete')
 
         return True