valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip the word 'Linux' for os grain

Browse Source
This commit is contained in:
Aaron Tygart 2012-11-12 14:14:42 -06:00
parent 48b4288dfd
commit 5a0b141d86
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/grains/core.py
View File

@ -408,14 +408,10 @@ def id_():
# This maps (at most) the first ten characters (no spaces, lowercased) of # This maps (at most) the first ten characters (no spaces, lowercased) of
# 'osfullname' to the 'os' grain that Salt traditionally uses. # 'osfullname' to the 'os' grain that Salt traditionally uses.
# Please see _supported_dists defined at the top of the file
_OS_NAME_MAP = { _OS_NAME_MAP = {
'redhatente': 'RedHat', 'redhatente': 'RedHat',
'debian': 'Debian',
'arch': 'Arch',
'gentoobase': 'Gentoo', 'gentoobase': 'Gentoo',
'amazonlinu': 'Amazon',
'centoslinu': 'CentOS',
'scientific': 'Scientific',
} }
# Map the 'os' grain to the 'os_family' grain # Map the 'os' grain to the 'os_family' grain
@ -508,11 +504,12 @@ def os_data():
osrelease).strip() osrelease).strip()
grains['oscodename'] = grains.get('lsb_distrib_codename', grains['oscodename'] = grains.get('lsb_distrib_codename',
oscodename).strip() oscodename).strip()
distroname = grains['osfullname'].replace(' Linux', '')
# return the first ten characters with no spaces, lowercased # return the first ten characters with no spaces, lowercased
shortname = grains['osfullname'].replace(' ', '').lower()[:10] shortname = distroname.replace(' ', '').lower()[:10]
# this maps the long names from the /etc/DISTRO-release files to the # this maps the long names from the /etc/DISTRO-release files to the
# traditional short names that Salt has used. # traditional short names that Salt has used.
grains['os'] = _OS_NAME_MAP.get(shortname, grains['osfullname']) grains['os'] = _OS_NAME_MAP.get(shortname, distroname)
grains.update(_linux_cpudata()) grains.update(_linux_cpudata())
elif grains['kernel'] == 'SunOS': elif grains['kernel'] == 'SunOS':
grains['os'] = 'Solaris' grains['os'] = 'Solaris'