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

fixes computenode_* grains on SmartOS compute nodes

Browse source
This commit is contained in:
Jorge Schrauwen 2016-06-29 18:12:37 +02:00
parent 65efb55917
commit 3ff895cacf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/grains/core.py
View file

@ -1391,8 +1391,8 @@ def os_data():
uname_v = os.uname()[3]
grains['os'] = grains['osfullname'] = 'SmartOS'
grains['osrelease'] = uname_v[uname_v.index('_')+1:]
elif salt.utils.is_smartos_globalzone():
grains.update(_smartos_computenode_data())
if salt.utils.is_smartos_globalzone():
grains.update(_smartos_computenode_data())
elif os.path.isfile('/etc/release'):
with salt.utils.fopen('/etc/release', 'r') as fp_:
rel_data = fp_.read()