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

some more cleanup for smartos

Browse source
This commit is contained in:
Super-User 2016-11-04 16:59:29 +01:00
parent d3ff39f09c
commit 88eddef765
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/grains/core.py
View file

@ -1425,17 +1425,17 @@ def os_data():
grains['os_family'] = 'Solaris'
if salt.utils.is_smartos():
# See https://github.com/joyent/smartos-live/issues/224
uname_v = os.uname()[3]
uname_v = os.uname()[3] # format: joyent_20161101T004406Z
uname_v = uname_v[uname_v.index('_')+1:]
grains['os'] = grains['osfullname'] = 'SmartOS'
# format: joyent_20161101T004406Z
# note: YYYY, MM, DD, timestamp
grains['osrelease_stamp'] = uname_v[uname_v.index('_')+1:]
# store a parsed version of YYYY.MM.DD as osrelease
grains['osrelease'] = ".".join([
uname_v[uname_v.index('_')+1:].split('T')[0][0:4],
uname_v[uname_v.index('_')+1:].split('T')[0][4:6],
uname_v[uname_v.index('_')+1:].split('T')[0][6:8],
uname_v[uname_v.index('_')+1:]
uname_v.split('T')[0][0:4],
uname_v.split('T')[0][4:6],
uname_v.split('T')[0][6:8],
])
# store a untouched copy of the timestamp in osrelease_stamp
grains['osrelease_stamp'] = uname_v
if salt.utils.is_smartos_globalzone():
grains.update(_smartos_computenode_data())
elif os.path.isfile('/etc/release'):