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
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 1c9cba3a397d53e399b82320507fb5141234c67f Mon Sep 17 00:00:00 2001
|
|
From: Jochen Breuer <jbreuer@suse.de>
|
|
Date: Thu, 6 Sep 2018 17:15:18 +0200
|
|
Subject: [PATCH] Fix for SUSE Expanded Support detection
|
|
|
|
A SUSE ES installation has both, the centos-release and redhat-release
|
|
file. Since os_data only used the centos-release file to detect a
|
|
CentOS installation, this lead to SUSE ES being detected as CentOS.
|
|
|
|
This change also adds a check for redhat-release and then marks the
|
|
'lsb_distrib_id' as RedHat.
|
|
---
|
|
salt/grains/core.py | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/grains/core.py b/salt/grains/core.py
|
|
index dc472a6c0a..a5c3a6a8cf 100644
|
|
--- a/salt/grains/core.py
|
|
+++ b/salt/grains/core.py
|
|
@@ -1593,8 +1593,17 @@ def os_data():
|
|
grains['lsb_distrib_codename'] = \
|
|
comps[3].replace('(', '').replace(')', '')
|
|
elif os.path.isfile('/etc/centos-release'):
|
|
- # CentOS Linux
|
|
- grains['lsb_distrib_id'] = 'CentOS'
|
|
+ log.trace('Parsing distrib info from /etc/centos-release')
|
|
+ # Maybe CentOS Linux; could also be SUSE Expanded Support.
|
|
+ # SUSE ES has both, centos-release and redhat-release.
|
|
+ if os.path.isfile('/etc/redhat-release'):
|
|
+ with salt.utils.files.fopen('/etc/redhat-release') as ifile:
|
|
+ for line in ifile:
|
|
+ if "red hat enterprise linux server" in line.lower():
|
|
+ # This is a SUSE Expanded Support Rhel installation
|
|
+ grains['lsb_distrib_id'] = 'RedHat'
|
|
+ break
|
|
+ grains.setdefault('lsb_distrib_id', 'CentOS')
|
|
with salt.utils.files.fopen('/etc/centos-release') as ifile:
|
|
for line in ifile:
|
|
# Need to pull out the version and codename
|
|
--
|
|
2.19.0
|
|
|
|
|