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

Merge pull request #33604 from kev009/fix-33578

Browse source 
Fix #33578 disks grain
This commit is contained in:
Mike Place 2016-05-31 08:17:36 -07:00
commit 44e8c9e720
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/grains/disks.py
View file

@ -57,18 +57,27 @@ class _geomconsts(object):
_datatypes = {
MEDIASIZE: ('re_int', r'(\d+)'),
SECTORSIZE: 'int',
STRIPESIZE: 'int',
STRIPEOFFSET: 'int',
ROTATIONRATE: 'int',
SECTORSIZE: 'try_int',
STRIPESIZE: 'try_int',
STRIPEOFFSET: 'try_int',
ROTATIONRATE: 'try_int',
}
def _datavalue(datatype, data):
if datatype == 'int':
return int(data)
elif datatype and datatype[0] == 're_int':
return int(re.search(datatype[1], data).group(1))
if datatype == 'try_int':
try:
return int(data)
except ValueError:
return None
elif datatype is tuple and datatype[0] == 're_int':
search = re.search(datatype[1], data)
if search:
try:
return int(search.group(1))
except ValueError:
return None
return None
else:
return data
@ -97,6 +106,8 @@ def _freebsd_geom():
tmp[_geomconsts._aliases[attrib]] = value
name = tmp.pop(_geomconsts.GEOMNAME)
if name.startswith('cd'):
return
ret['disks'][name] = tmp
if tmp[_geomconsts.ROTATIONRATE] == 0: