Merge pull request #26589 from hatchery/develop

Give MacOS an 'os_family' grain
This commit is contained in:
Justin Findlay 2015-08-22 10:00:26 -06:00
commit 82b2633dc7

View File

@ -1299,6 +1299,7 @@ def os_data():
elif grains['kernel'] == 'Darwin':
osrelease = __salt__['cmd.run']('sw_vers -productVersion')
grains['os'] = 'MacOS'
grains['os_family'] = 'MacOS'
grains['osrelease'] = osrelease
grains['osmajorrelease'] = osrelease.rsplit('.', 1)[0]
grains.update(_bsd_cpudata(grains))