6409c07939
- Remove salt-minion python2 requirement when python3 is default (bsc#1081592) - Remove-obsolete-unicode-handling-in-pkg.info_installed - Added: * remove-obsolete-unicode-handling-in-pkg.info_install.patch - Update to salt-2018.1.99 - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * list_pkgs-add-parameter-for-returned-attribute-selec.patch * run-salt-api-as-user-salt-bsc-1064520.patch * run-salt-master-as-dedicated-salt-user.patch - Deleted: * python3-compatibility-fix-got-bytes-instead-of-strin.patch * enable-with-salt-version-parameter-for-setup.py-scri.patch * catching-error-when-pidfile-cannot-be-deleted.patch * bugfix-always-return-a-string-list-on-unknown-job-ta.patch * bugfix-the-logic-according-to-the-exact-described-pu.patch * cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch * fix-for-delete_deployment-in-kubernetes-module.patch * fix-salt-master-for-old-psutil.patch * introduce-process_count_max-minion-configuration-par.patch * multiprocessing-minion-option-documentation-fixes.patch * older-logrotate-need-su-directive.patch * return-error-when-gid_from_name-and-group-does-not-e.patch * set-shell-environment-variable-64.patch * split-only-strings-if-they-are-such.patch OBS-URL: https://build.opensuse.org/request/show/581002 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=112
27 lines
882 B
Diff
27 lines
882 B
Diff
From b221de02c16f4be9871a1190f31f150b5fe2652c 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.1
|
|
|
|
|