Merge pull request #11940 from alxgu/fix_lvm_facts

bugfix: missing path for lvm facts
This commit is contained in:
Brian Coca 2015-08-12 10:49:14 -04:00
commit 2688edb32b

View file

@ -1073,12 +1073,14 @@ class LinuxHardware(Hardware):
""" Get LVM Facts if running as root and lvm utils are available """
if os.getuid() == 0 and module.get_bin_path('vgs'):
vgs_path = module.get_bin_path('vgs')
lvs_path = module.get_bin_path('lvs')
lvm_util_options = '--noheadings --nosuffix --units g'
#vgs fields: VG #PV #LV #SN Attr VSize VFree
vgs={}
rc, vg_lines, err = module.run_command(
'vgs %s' % lvm_util_options)
'%s %s' % (vgs_path, lvm_util_options))
for vg_line in vg_lines.splitlines():
items = vg_line.split()
vgs[items[0]] = {'size_g':items[-2],
@ -1090,7 +1092,7 @@ class LinuxHardware(Hardware):
#LV VG Attr LSize Pool Origin Data% Move Log Copy% Convert
lvs = {}
rc, lv_lines, err = module.run_command(
'lvs %s' % lvm_util_options)
'%s %s' % (lvs_path, lvm_util_options))
for lv_line in lv_lines.splitlines():
items = lv_line.split()
lvs[items[0]] = {'size_g': items[3],