valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimize BrandZ detection and remove mdata grains

Browse Source 
We can use os.uname() to detect if we are running in a LX zone on
SmartOS. This saves us one fork/exec.

The mdata stuff has also been removed from the core grain module.
A seperate grain module will be take it's place. This to improve
the core grains readability and to nicely seperate out the
functionality.
This commit is contained in:
Super-User 2017-04-21 16:51:33 +02:00
parent 8652ad68c8
commit ac082f1935
1 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
salt/grains/core.py
View File

@ -529,13 +529,9 @@ def _virtual(osdata):
# Quick backout for BrandZ (Solaris LX Branded zones)
# Don't waste time trying other commands to detect the virtual grain
uname = salt.utils.which('uname')
if osdata['kernel'] == 'Linux' and uname:
ret = __salt__['cmd.run_all']('{0} -v'.format(uname))
if 'BrandZ' in ret['stdout']:
grains['virtual'] = 'zone'
grains.update(_mdata())
return grains
if osdata['kernel'] == 'Linux' and 'BrandZ virtual linux' in os.uname():
grains['virtual'] = 'zone'
return grains
failed_commands = set()
for command in _cmds:
@ -2306,42 +2302,6 @@ def _smartos_zone_data():
grains['zonename'] = __salt__['cmd.run']('zonename')
grains['zoneid'] = __salt__['cmd.run']('zoneadm list -p | awk -F: \'{ print $1 }\'', python_shell=True)
grains.update(_mdata())
return grains
def _mdata():
'''
Provide grains from the SmartOS metadata
'''
grains = {}
mdata_list = salt.utils.which('mdata-list')
mdata_get = salt.utils.which('mdata-get')
# parse sdc metadata
grains['hypervisor_uuid'] = __salt__['cmd.run']('{0} sdc:server_uuid'.format(mdata_get))
if "FAILURE" in grains['hypervisor_uuid'] or "No metadata" in grains['hypervisor_uuid']:
grains['hypervisor_uuid'] = "Unknown"
grains['datacenter'] = __salt__['cmd.run']('{0} sdc:datacenter_name'.format(mdata_get))
if "FAILURE" in grains['datacenter'] or "No metadata" in grains['datacenter']:
grains['datacenter'] = "Unknown"
# parse vmadm metadata
for mdata_grain in __salt__['cmd.run'](mdata_list).splitlines():
grain_data = __salt__['cmd.run']('{0} {1}'.format(mdata_get, mdata_grain))
if mdata_grain == 'roles': # parse roles as roles grain
grain_data = grain_data.split(',')
grains['roles'] = grain_data
else: # parse other grains into mdata
if not mdata_grain.startswith('sdc:'):
if 'mdata' not in grains:
grains['mdata'] = {}
mdata_grain = mdata_grain.replace('-', '_')
mdata_grain = mdata_grain.replace(':', '_')
grains['mdata'][mdata_grain] = grain_data
return grains