valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OS related grains on openSUSE and SUSE Linux Enterprise

Browse Source 
Starting from openSUSE 13 and SUSE Linux Enterprise 12 the file
`/etc/os-release` is part of these distributions. Future releases are
also going to drop `/etc/SuSE-release`.

The presence of `/etc/os-release` prevents the execution of the code
parsing `/etc/SuSE-release`, leading to missing/wrong grains.

Without this code on a SLE12 SP1 machine salt would produce these
grains:
  * osrelease: 12
  * oselease_info: [12]
  * oscodename: x86_64

With this commit the following new grains are set:
  * lsb_distrib_codename: SUSE Linux Enterprise Server 12 SP1
  * lsb_distrib_release: 12.1

Moreover the following grains are properly set:
  * osrelease: 12.1
  * oselease_info: [12, 1]
  * os_codename: SUSE Linux Enterprise Server 12 SP1

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
This commit is contained in:
Flavio Castelli 2015-10-07 21:24:03 +02:00
parent 82a51cebde
commit fc8d296d72
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/grains/core.py
View File

@ -1138,7 +1138,7 @@ def os_data():
] = match.groups()[1].rstrip() ] = match.groups()[1].rstrip()
if 'lsb_distrib_id' not in grains: if 'lsb_distrib_id' not in grains:
if os.path.isfile('/etc/os-release'): if os.path.isfile('/etc/os-release'):
# Arch ARM Linux # Arch ARM Linux - SUSE 12+ - openSUSE 13+
with salt.utils.fopen('/etc/os-release') as ifile: with salt.utils.fopen('/etc/os-release') as ifile:
# Imitate lsb-release # Imitate lsb-release
for line in ifile: for line in ifile:
@ -1159,6 +1159,10 @@ def os_data():
name, value = match.groups() name, value = match.groups()
if name.lower() == 'name': if name.lower() == 'name':
grains['lsb_distrib_id'] = value.strip() grains['lsb_distrib_id'] = value.strip()
elif name.lower() == 'version_id':
grains['lsb_distrib_release'] = value
elif name.lower() == 'pretty_name':
grains['lsb_distrib_codename'] = value
elif os.path.isfile('/etc/SuSE-release'): elif os.path.isfile('/etc/SuSE-release'):
grains['lsb_distrib_id'] = 'SUSE' grains['lsb_distrib_id'] = 'SUSE'
with salt.utils.fopen('/etc/SuSE-release') as fhr: with salt.utils.fopen('/etc/SuSE-release') as fhr: