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

pylint clean up

Browse Source
This commit is contained in:
David Murphy 2018-05-23 12:31:09 -06:00
parent 798c5fdf54
commit d1cf515386
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/grains/core.py
View File

@ -577,11 +577,9 @@ def _aix_memdata():
swap_cmd = salt.utils.path.which('swap')
swap_data = __salt__['cmd.run']('{0} -s'.format(swap_cmd)).split() # 4k blocks
try:
swap_avail = int(swap_data[-2]) * 4
swap_avail = int(swap_data[-2]) * 4
swap_used = int(swap_data[-6]) * 4
swap_total = (swap_avail + swap_used)
# above to be * 4
except ValueError:
swap_total = None
grains['swap_total'] = swap_total
@ -1894,7 +1892,7 @@ def os_data():
osbuild = __salt__['cmd.run']('sw_vers -buildVersion')
grains['os'] = 'MacOS'
grains['os_family'] = 'MacOS'
grains['osfullname'] = "{0} {1}".format(osname, osrelease_techlevel)
grains['osfullname'] = "{0} {1}".format(osname, osrelease)
grains['osrelease'] = osrelease
grains['osbuild'] = osbuild
grains['init'] = 'launchd'