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

Merge pull request #27530 from SaltyCharles/add-osfinger-osmajor-osx-grains

Browse Source 
add osfinger and osmajorrelease to osx grains
This commit is contained in:
Mike Place 2015-09-30 09:18:37 -06:00
commit d78e14002c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/grains/core.py
View File

@ -1388,6 +1388,12 @@ def os_data():
grains['osfinger'] = '{os}-{ver}'.format(
os=grains['os'],
ver=grains['osrelease'])
elif grains.get('os') in 'MacOS':
grains['osmajorrelease'] = grains['osrelease'].split('.', 1)[0]
grains['osfinger'] = '{os}-{ver}'.format(
os=grains['os'],
ver=grains['osrelease'].rsplit('.', 1)[0])
if grains.get('osrelease', ''):
osrelease_info = grains['osrelease'].split('.')