cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

now lvs/vg facts are only attempted if binary found

Browse source
This commit is contained in:
Brian Coca 2015-08-12 10:53:13 -04:00
parent c7dde72aa0
commit 6bceee9a93
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/module_utils/facts.py
View file

@ -1073,14 +1073,13 @@ class LinuxHardware(Hardware):
""" Get LVM Facts if running as root and lvm utils are available """ """ Get LVM Facts if running as root and lvm utils are available """
if os.getuid() == 0 and module.get_bin_path('vgs'): 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' lvm_util_options = '--noheadings --nosuffix --units g'
vgs_path = module.get_bin_path('vgs')
#vgs fields: VG #PV #LV #SN Attr VSize VFree #vgs fields: VG #PV #LV #SN Attr VSize VFree
vgs={} vgs={}
rc, vg_lines, err = module.run_command( if vgs_path:
'%s %s' % (vgs_path, lvm_util_options)) rc, vg_lines, err = module.run_command( '%s %s' % (vgs_path, lvm_util_options))
for vg_line in vg_lines.splitlines(): for vg_line in vg_lines.splitlines():
items = vg_line.split() items = vg_line.split()
vgs[items[0]] = {'size_g':items[-2], vgs[items[0]] = {'size_g':items[-2],
@ -1088,18 +1087,17 @@ class LinuxHardware(Hardware):
'num_lvs': items[2], 'num_lvs': items[2],
'num_pvs': items[1]} 'num_pvs': items[1]}
lvs_path = module.get_bin_path('lvs')
#lvs fields: #lvs fields:
#LV VG Attr LSize Pool Origin Data% Move Log Copy% Convert #LV VG Attr LSize Pool Origin Data% Move Log Copy% Convert
lvs = {} lvs = {}
rc, lv_lines, err = module.run_command( if lvs_path:
'%s %s' % (lvs_path, lvm_util_options)) rc, lv_lines, err = module.run_command( '%s %s' % (lvs_path, lvm_util_options))
for lv_line in lv_lines.splitlines(): for lv_line in lv_lines.splitlines():
items = lv_line.split() items = lv_line.split()
lvs[items[0]] = {'size_g': items[3], lvs[items[0]] = {'size_g': items[3], 'vg': items[1]}
'vg': items[1]}
self.facts['lvm'] = {'lvs': lvs, self.facts['lvm'] = {'lvs': lvs, 'vgs': vgs}
'vgs': vgs}
class SunOSHardware(Hardware): class SunOSHardware(Hardware):