b17d3e3575
- Fix the usage of custom macros on the spec file. - Fix RES7: different dependency names for python-PyYAML and python-MarkupSafe - Build both python2 and python3 binaries together. - Bugfix: errors in external pillar causes crash instead of report of them (bsc#1068446) - Fix 'user.present' when 'gid_from_name' is set but group does not exist. - Added: * bugfix-the-logic-according-to-the-exact-described-pu.patch * return-error-when-gid_from_name-and-group-does-not-e.patch - Fix "No service execution module loaded" issue (bsc#1065792) - Set SHELL environment variable Added: * fix-bsc-1065792.patch * set-shell-environment-variable-64.patch - Removed unnecessary logging on shutdown (bsc#1050003) - Renamed patch that adds grain fqdns Changed: * catching-error-when-pidfile-cannot-be-deleted Removed: * fix-for-pidfile-removal-logging Renamed: * add-fqdns-grains -> feat-add-grain-for-all-fqdns OBS-URL: https://build.opensuse.org/request/show/569868 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=107
27 lines
882 B
Diff
27 lines
882 B
Diff
From 2a88378d88c2f56b152ef048214728995476244a 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 33cbb8fa0a..10b608cc7a 100644
|
|
--- a/salt/minion.py
|
|
+++ b/salt/minion.py
|
|
@@ -404,7 +404,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.15.1
|
|
|
|
|