aeed45986b
- Update to 2018.3.0
- Modified:
* explore-module.run-response-to-catch-the-result-in-d.patch
* add-saltssh-multi-version-support-across-python-inte.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-decrease-loglevel-when-unable-to-resolve-addr.patch
* fix-cp.push-empty-file.patch
* make-it-possible-to-use-login-pull-and-push-from-mod.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* run-salt-master-as-dedicated-salt-user.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Add python-2.6 support to salt-ssh
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Update salt-ssh multiversion patch
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Removed:
* require-same-major-version-while-minor-is-allowed-to.patch
OBS-URL: https://build.opensuse.org/request/show/594031
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=117
27 lines
882 B
Diff
27 lines
882 B
Diff
From 957ac8fe161db2c4b3b8fe8b84027bc15e144a49 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 df69d3c7bd..4a30e70be5 100644
|
|
--- a/salt/minion.py
|
|
+++ b/salt/minion.py
|
|
@@ -439,7 +439,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.2
|
|
|
|
|