diff options
| author | Adam Miller <admiller@redhat.com> | 2018-01-10 06:28:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 06:28:38 -0800 |
| commit | ef0b705c08396a2d631bc5e0b480afbcfac2d842 (patch) | |
| tree | 6e901ffa9189182e9ab43037d48ee2f8302f8503 | |
| parent | 564e013534c6ba28c16b6646a14e624a08b27716 (diff) | |
| download | ansible-ef0b705c08396a2d631bc5e0b480afbcfac2d842.tar.gz | |
Fix Linux blockdevice size computation (#34475) (#34647)
Linux' sysfs _always_ reports device size in 512b sector units,
regardless of the device's actual, physical blocksize.
| -rw-r--r-- | lib/ansible/module_utils/facts/hardware/linux.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/facts/hardware/linux.py b/lib/ansible/module_utils/facts/hardware/linux.py index eb1d0fc914..d23083040f 100644 --- a/lib/ansible/module_utils/facts/hardware/linux.py +++ b/lib/ansible/module_utils/facts/hardware/linux.py @@ -601,7 +601,7 @@ class LinuxHardware(Hardware): part['sectorsize'] = get_file_content(part_sysdir + "/queue/logical_block_size") if not part['sectorsize']: part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size", 512) - part['size'] = bytes_to_human((float(part['sectors']) * float(part['sectorsize']))) + part['size'] = bytes_to_human((float(part['sectors']) * 512.0)) part['uuid'] = get_partition_uuid(partname) self.get_holders(part, part_sysdir) @@ -621,7 +621,7 @@ class LinuxHardware(Hardware): d['sectorsize'] = get_file_content(sysdir + "/queue/logical_block_size") if not d['sectorsize']: d['sectorsize'] = get_file_content(sysdir + "/queue/hw_sector_size", 512) - d['size'] = bytes_to_human(float(d['sectors']) * float(d['sectorsize'])) + d['size'] = bytes_to_human(float(d['sectors']) * 512.0) d['host'] = "" |