File activate-all-beacons-sources-config-pillar-grains.patch of Package salt.23536

From c44b897eb1305c6b9c341fc16f729d2293ab24e4 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Tue, 17 Oct 2017 16:52:33 +0200
Subject: [PATCH] Activate all beacons sources: config/pillar/grains

---
 salt/minion.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/salt/minion.py b/salt/minion.py
index c255f37c26..4da665a130 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -508,9 +508,7 @@ class MinionBase:
         the pillar or grains changed
         """
         if "config.merge" in functions:
-            b_conf = functions["config.merge"](
-                "beacons", self.opts["beacons"], omit_opts=True
-            )
+            b_conf = functions["config.merge"]("beacons", self.opts["beacons"])
             if b_conf:
                 return self.beacons.process(
                     b_conf, self.opts["grains"]
-- 
2.29.2