f635624f70
- No more AWS EC2 rate limitations in salt-cloud (bsc#1088888)
- MySQL returner now also allows to use Unix sockets (bsc#1091371)
- Added:
* fix-for-ec2-rate-limit-failures.patch
* enable-passing-a-unix_socket-for-mysql-returners-bsc.patch
- Do not override jid on returners, only sending back to master (bsc#1092373)
- Fixes for salt-ssh:
- Option --extra-filerefs doesn't add all files to the state
archive
- Pillar completely overwritten (not merged) when doing
module.run + state.apply with pillar in kwargs
- Remove minion/thin/version if exists to force thin regeneration (bsc#1092161)
- Added:
* extra-filerefs-include-files-even-if-no-refs-in-stat.patch
* do-not-override-jid-on-returners-only-sending-back-t.patch
* option-to-merge-current-pillar-with-opts-pillar-duri.patch
OBS-URL: https://build.opensuse.org/request/show/609093
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=123
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From c49a9aca3519d1baef2f9d82963a6e80eabb26d4 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 6cb3ce0ef8..e81ae143bd 100644
|
|
--- a/salt/utils/schedule.py
|
|
+++ b/salt/utils/schedule.py
|
|
@@ -753,11 +753,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.15.1
|
|
|
|
|