51d9b78cf8
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=156
27 lines
882 B
Diff
27 lines
882 B
Diff
From 45b3ee6c8255c2daa6ed291a430a6325155ef29c 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 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/minion.py b/salt/minion.py
|
|
index 6912d9587f..c5f637eaa6 100644
|
|
--- a/salt/minion.py
|
|
+++ b/salt/minion.py
|
|
@@ -484,7 +484,7 @@ class MinionBase(object):
|
|
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']) # pylint: disable=no-member
|
|
return []
|
|
--
|
|
2.16.4
|
|
|
|
|