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

handle Oracle Solaris better

Browse source
This commit is contained in:
Super-User 2016-11-04 21:33:11 +01:00
parent 69706d32be
commit 37c3a7f5ab
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/grains/core.py
View file

@ -1443,7 +1443,7 @@ def os_data():
rel_data = fp_.read()
try:
release_re = re.compile(
r'((?:Open)?Solaris|OpenIndiana) (Development)?'
r'((?:Open|Oracle )?Solaris|OpenIndiana) (Development)?'
r'\s*(\d+)\s?\D*\s?(\d+\/\d+|oi_\S+|snv_\S+)?'
)
osname, development, osmajorrelease, osminorrelease = \
@ -1458,15 +1458,18 @@ def os_data():
osname = ' '.join((osname, development))
uname_v = os.uname()[3]
grains['os'] = grains['osfullname'] = osname
osrelease = []
osrelease.append(osmajorrelease)
if '/' in osminorrelease:
osrelease.append(osminorrelease.split('/')[0])
osrelease.append(osminorrelease.split('/')[1])
if osname in ['Oracle Solaris'] and uname_v.startswith(osmajorrelease):
# Oracla Solars 11 and up have minor version in uname
grains['osrelease'] = uname_v
else:
osrelease.append(osminorrelease)
grains['osrelease'] = ".".join(osrelease)
grains['osrelease_stamp'] = uname_v
# Sun Solaris 10 and earlier/comparable
# (OpenIndiana, OmniOS)
osrelease = []
osrelease.append(osmajorrelease)
if osminorrelease:
osrelease.append(osminorrelease)
grains['osrelease'] = ".".join(osrelease)
grains['osrelease_stamp'] = uname_v
grains.update(_sunos_cpudata())
elif grains['kernel'] == 'VMkernel':