saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add ServicePack to osrelease

Browse source
This commit is contained in:
twangboy 2016-09-16 14:36:05 -06:00
parent 92034936c1
commit ac8610d523
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/grains/core.py
View file

@ -863,14 +863,19 @@ def _windows_platform_data():
# location. For example:
# 'Microsoft Windows Server 2008 R2 Standard |C:\\Windows|\\Device\\Harddisk0\\Partition2'
osrelease = platform.release()
if salt.utils.win_osinfo.get_os_version_info()['ProductType'] > 1:
server = {'Vista': '2008',
'7': '2008R2',
'8': '2012',
'8.1': '2012R2',
'10': '2016'}
info = salt.utils.win_osinfo.get_os_version_info()
if info['ProductType'] > 1:
server = {'Vista': 'Server 2008',
'7': 'Server 2008 R2',
'8': 'Server 2012',
'8.1': 'Server 2012 R2',
'10': 'Server 2016'}
osrelease = server[osrelease]
if info['ServicePackMajor'] > 0:
service_pack = ''.join('SP', info['ServicePackMajor'])
osrelease = ' '.join([osrelease, service_pack])
grains = {
'osversion': osinfo.Version,
'osrelease': osrelease,