c0d7cc4bb8
- Prepend current directory when path is just filename (bsc#1095942) - Integration of MSI authentication for azurearm - Adds fix for SUSE Expanded Support os grain detection - Fixes 509x remote signing - Fix for StringIO import in Python2 - Use Adler32 algorithm to compute string checksums (bsc#1102819) - Only do reverse DNS lookup on IPs for salt-ssh (bsc#1104154) - Add support for Python 3.7 - Fix license macro to build on SLE12SP2 - Decode file contents for python2 (bsc#1102013) - Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413) - Fix mine.get not returning data - workaround for #48020 (bsc#1100142) - Added: * change-stringio-import-in-python2-to-import-the-clas.patch * integration-of-msi-authentication-with-azurearm-clou.patch * x509-fixes-for-remote-signing-106.patch * fix-for-suse-expanded-support-detection.patch * only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch * prepend-current-directory-when-path-is-just-filename.patch * add-support-for-python-3.7.patch * decode-file-contents-for-python2-bsc-1102013.patch * fix-mine.get-not-returning-data-workaround-for-48020.patch * x509-fixes-111.patch * use-adler32-algorithm-to-compute-string-checksums.patch - Modified: * fix-for-sorting-of-multi-version-packages-bsc-109717.patch OBS-URL: https://build.opensuse.org/request/show/636187 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=129
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From f8c0811c3a05ef334eef1943a906fe01b13c1afc Mon Sep 17 00:00:00 2001
|
|
From: Federico Ceratto <federico.ceratto@suse.com>
|
|
Date: Wed, 25 Jul 2018 10:33:09 +0000
|
|
Subject: [PATCH] Fix mine.get not returning data (Workaround for #48020)
|
|
|
|
---
|
|
salt/utils/minions.py | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/salt/utils/minions.py b/salt/utils/minions.py
|
|
index c3acc6ba90..bb0cbaa589 100644
|
|
--- a/salt/utils/minions.py
|
|
+++ b/salt/utils/minions.py
|
|
@@ -239,12 +239,12 @@ class CkMinions(object):
|
|
Retreive complete minion list from PKI dir.
|
|
Respects cache if configured
|
|
'''
|
|
- if self.opts.get('__role') == 'master' and self.opts.get('__cli') == 'salt-run':
|
|
- # Compiling pillar directly on the master, just return the master's
|
|
- # ID as that is the only one that is available.
|
|
- return [self.opts['id']]
|
|
minions = []
|
|
pki_cache_fn = os.path.join(self.opts['pki_dir'], self.acc, '.key_cache')
|
|
+ try:
|
|
+ os.makedirs(os.path.dirname(pki_cache_fn))
|
|
+ except OSError:
|
|
+ pass
|
|
try:
|
|
if self.opts['key_cache'] and os.path.exists(pki_cache_fn):
|
|
log.debug('Returning cached minion list')
|
|
--
|
|
2.17.1
|
|
|
|
|