27aee8f99b
- Create minion_id with reproducible mtime - Fix detection of Salt codename by "salt_version" execution module - Fix regression: multiple values for keyword argument 'saltenv' (bsc#1212844) - Fix the regression of user.present state when group is unset (bsc#1212855) - Fix zypper repositories always being reconfigured - Fix utf8 handling in 'pass' renderer and make it more robust - Prevent _pygit2.GitError: error loading known_hosts when $HOME is not set (bsc#1210994) - Fix ModuleNotFoundError and other issues raised by salt-support module (bsc#1211591) - tornado: Fix an open redirect in StaticFileHandler (CVE-2023-28370, bsc#1211741) - Make master_tops compatible with Salt 3000 and older minions (bsc#1212516) (bsc#1212517) - Avoid failures due transactional_update module not available in Salt 3006.0 (bsc#1211754) - Avoid conflicts with Salt dependencies versions (bsc#1211612) - Added: * fix-utf8-handling-in-pass-renderer-and-make-it-more-.patch * fix-the-regression-of-user.present-state-when-group-.patch * make-master_tops-compatible-with-salt-3000-and-older.patch * avoid-conflicts-with-dependencies-versions-bsc-12116.patch * tornado-fix-an-open-redirect-in-staticfilehandler-cv.patch * fix-regression-multiple-values-for-keyword-argument-.patch * zypper-pkgrepo-alreadyconfigured-585.patch * mark-salt-3006-as-released-586.patch * fix-some-issues-detected-in-salt-support-cli-module-.patch * define-__virtualname__-for-transactional_update-modu.patch * 3006.0-prevent-_pygit2.giterror-error-loading-known_.patch OBS-URL: https://build.opensuse.org/request/show/1103185 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=212
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 53a5a62191b81c6838c3041cf95ffeb12fbab5b5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Mon, 19 Jun 2023 15:35:41 +0100
|
|
Subject: [PATCH] Make master_tops compatible with Salt 3000 and older
|
|
minions (bsc#1212516) (bsc#1212517) (#587)
|
|
|
|
---
|
|
salt/master.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/salt/master.py b/salt/master.py
|
|
index da1eb8cef5..fc243ef674 100644
|
|
--- a/salt/master.py
|
|
+++ b/salt/master.py
|
|
@@ -1213,6 +1213,7 @@ class AESFuncs(TransportMethods):
|
|
"_dir_list",
|
|
"_symlink_list",
|
|
"_file_envs",
|
|
+ "_ext_nodes", # To keep compatibility with old Salt minion versions
|
|
)
|
|
|
|
def __init__(self, opts, context=None):
|
|
@@ -1412,6 +1413,9 @@ class AESFuncs(TransportMethods):
|
|
return {}
|
|
return self.masterapi._master_tops(load, skip_verify=True)
|
|
|
|
+ # Needed so older minions can request master_tops
|
|
+ _ext_nodes = _master_tops
|
|
+
|
|
def _master_opts(self, load):
|
|
"""
|
|
Return the master options to the minion
|
|
--
|
|
2.41.0
|
|
|
|
|