Accepting request 922525 from systemsmanagement:saltstack

- Do not break master_tops for minion with version lower to 3003
- Added:
  * do-not-break-master_tops-for-minion-with-version-low.patch

OBS-URL: https://build.opensuse.org/request/show/922525
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=120

_lastrevision

@@ -1 +1 @@
-deacfe2304a0b9f34a9130b61bd69dea851962a7
+0f00e37ce7f38b6d92b7a2b04cb2faa03098b0fc

do-not-break-master_tops-for-minion-with-version-low.patch

@@ -0,0 +1,37 @@
+From a4412799453bf967aa14b93660bfc70f94e11a85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
+ <psuarezhernandez@suse.com>
+Date: Thu, 30 Sep 2021 11:06:09 +0100
+Subject: [PATCH] Do not break master_tops for minion with version lower
+ to 3003
+
+---
+ salt/master.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/salt/master.py b/salt/master.py
+index 1bfd278b31..2c5739cc90 100644
+--- a/salt/master.py
++++ b/salt/master.py
+@@ -1234,6 +1234,7 @@ class AESFuncs(TransportMethods):
+         "_dir_list",
+         "_symlink_list",
+         "_file_envs",
++        "_ext_nodes",
+     )
+ 
+     def __init__(self, opts):
+@@ -1433,6 +1434,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.33.0
+
+

salt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 30 10:49:56 UTC 2021 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
+
+- Do not break master_tops for minion with version lower to 3003
+
+- Added:
+  * do-not-break-master_tops-for-minion-with-version-low.patch
+
 -------------------------------------------------------------------
 Fri Sep 24 15:07:50 UTC 2021 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
 

salt.spec

@@ -284,6 +284,8 @@ Patch67:        don-t-use-shell-sbin-nologin-in-requisites.patch
 Patch68:        templates-move-the-globals-up-to-the-environment-jin.patch
 # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/59777
 Patch69:        3003.3-postgresql-json-support-in-pillar-423.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/60980
+Patch70:        do-not-break-master_tops-for-minion-with-version-low.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -768,6 +770,7 @@ cp %{S:6} .
 %patch67 -p1
 %patch68 -p1
 %patch69 -p1
+%patch70 -p1
 
 %build
 # Putting /usr/bin at the front of $PATH is needed for RHEL/RES 7. Without this