7966fde1ef
- Update to 2018.3.2 See https://docs.saltstack.com/en/latest/topics/releases/2018.3.2.html for full changelog - Added: * accounting-for-when-files-in-an-archive-contain-non-.patch * add-all_versions-parameter-to-include-all-installed-.patch * add-custom-suse-capabilities-as-grains.patch * add-engine-relaying-libvirt-events.patch * add-environment-variable-to-know-if-yum-is-invoked-f.patch * add-other-attribute-to-gecos-fields-to-avoid-inconsi.patch * align-suse-salt-master.service-limitnofiles-limit-wi.patch * avoid-incomprehensive-message-if-crashes.patch * fix-deprecation-warning-bsc-1095507.patch * fix-diffing-binary-files-in-file.get_diff-bsc-109839.patch * fix-unboundlocalerror-in-file.get_diff.patch * fix-zypper.list_pkgs-to-be-aligned-with-pkg-state.patch * prevent-zypper-from-parsing-repo-configuration-from-.patch * remove-old-hack-when-reporting-multiversion-packages.patch * show-recommendations-for-salt-ssh-cross-version-pyth.patch - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * add-saltssh-multi-version-support-across-python-inte.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * do-not-override-jid-on-returners-only-sending-back-t.patch * enable-passing-a-unix_socket-for-mysql-returners-bsc.patch * fall-back-to-pymysql.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * fix-decrease-loglevel-when-unable-to-resolve-addr.patch * fix-for-ec2-rate-limit-failures.patch OBS-URL: https://build.opensuse.org/request/show/626472 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=127
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 911d61d1479d89ed31b23b038874505b731c6d86 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Fri, 4 May 2018 09:34:13 +0100
|
|
Subject: [PATCH] Do not override jid on returners, only sending back to
|
|
master (bsc#1092373)
|
|
|
|
---
|
|
salt/utils/schedule.py | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py
|
|
index 65c2e3fbda..32fdae9786 100644
|
|
--- a/salt/utils/schedule.py
|
|
+++ b/salt/utils/schedule.py
|
|
@@ -755,11 +755,13 @@ class Schedule(object):
|
|
else:
|
|
# Send back to master so the job is included in the job list
|
|
mret = ret.copy()
|
|
- mret['jid'] = 'req'
|
|
- if data.get('return_job') == 'nocache':
|
|
- # overwrite 'req' to signal to master that
|
|
- # this job shouldn't be stored
|
|
- mret['jid'] = 'nocache'
|
|
+ # No returners defined, so we're only sending back to the master
|
|
+ if not data_returner and not self.schedule_returner:
|
|
+ mret['jid'] = 'req'
|
|
+ if data.get('return_job') == 'nocache':
|
|
+ # overwrite 'req' to signal to master that
|
|
+ # this job shouldn't be stored
|
|
+ mret['jid'] = 'nocache'
|
|
load = {'cmd': '_return', 'id': self.opts['id']}
|
|
for key, value in six.iteritems(mret):
|
|
load[key] = value
|
|
--
|
|
2.13.7
|
|
|
|
|