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
33 lines
976 B
Diff
33 lines
976 B
Diff
From 544dfd7dbaa1c837b75976f15ad67159b1bdedbb Mon Sep 17 00:00:00 2001
|
|
From: Matei Albu <malbu@suse.de>
|
|
Date: Sun, 6 May 2018 11:56:18 +0200
|
|
Subject: [PATCH] --extra-filerefs include files even if no refs in
|
|
states to apply
|
|
|
|
Fixes #47496
|
|
(cherry picked from commit d67239a)
|
|
---
|
|
salt/client/ssh/state.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/client/ssh/state.py b/salt/client/ssh/state.py
|
|
index 8fa11d031e..08d4846bb6 100644
|
|
--- a/salt/client/ssh/state.py
|
|
+++ b/salt/client/ssh/state.py
|
|
@@ -135,9 +135,9 @@ def lowstate_file_refs(chunks, extras=''):
|
|
elif state.startswith('__'):
|
|
continue
|
|
crefs.extend(salt_refs(chunk[state]))
|
|
+ if saltenv not in refs:
|
|
+ refs[saltenv] = []
|
|
if crefs:
|
|
- if saltenv not in refs:
|
|
- refs[saltenv] = []
|
|
refs[saltenv].append(crefs)
|
|
if extras:
|
|
extra_refs = extras.split(',')
|
|
--
|
|
2.13.6
|
|
|
|
|