bbe3fe8f72
- Update patches
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Removed:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
- Update cp.push patch
- Modified:
* fix-cp.push-empty-file.patch
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- force re-generate a new thin.tgz when an update gets installed
- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:
OBS-URL: https://build.opensuse.org/request/show/586784
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=115
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 76706e2b241c932e4067487139325dc16ca08477 Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Sun, 11 Feb 2018 19:15:27 +0100
|
|
Subject: [PATCH] move log_file option to changeable defaults
|
|
|
|
---
|
|
salt/client/ssh/__init__.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
|
|
index 3dd46899e3..f1c1ad9a22 100644
|
|
--- a/salt/client/ssh/__init__.py
|
|
+++ b/salt/client/ssh/__init__.py
|
|
@@ -884,6 +884,7 @@ class Single(object):
|
|
# Pre apply changeable defaults
|
|
self.minion_opts = {
|
|
'grains_cache': True,
|
|
+ 'log_file': 'salt-call.log',
|
|
}
|
|
self.minion_opts.update(opts.get('ssh_minion_opts', {}))
|
|
if minion_opts is not None:
|
|
@@ -893,7 +894,6 @@ class Single(object):
|
|
'root_dir': os.path.join(self.thin_dir, 'running_data'),
|
|
'id': self.id,
|
|
'sock_dir': '/',
|
|
- 'log_file': 'salt-call.log',
|
|
'fileserver_list_cache_time': 3,
|
|
})
|
|
self.minion_config = salt.serializers.yaml.serialize(self.minion_opts)
|
|
--
|
|
2.16.2
|
|
|
|
|