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

Fix regression in format of lvm facts (#30326)

Browse source 
lvm information should not have leading whitespace in the key names

Fixes #30006
This commit is contained in:
Toshio Kuratomi 2017-09-13 20:50:47 -07:00 committed by Jordan Borean
parent 60d9a12efd
commit 62f49120cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/facts/hardware/linux.py
View file

@ -671,7 +671,7 @@ class LinuxHardware(Hardware):
if vgs_path: if vgs_path:
rc, vg_lines, err = self.module.run_command('%s %s' % (vgs_path, lvm_util_options)) rc, vg_lines, err = self.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.strip().split(',')
vgs[items[0]] = {'size_g': items[-2], vgs[items[0]] = {'size_g': items[-2],
'free_g': items[-1], 'free_g': items[-1],
'num_lvs': items[2], 'num_lvs': items[2],
@ -684,7 +684,7 @@ class LinuxHardware(Hardware):
if lvs_path: if lvs_path:
rc, lv_lines, err = self.module.run_command('%s %s' % (lvs_path, lvm_util_options)) rc, lv_lines, err = self.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.strip().split(',')
lvs[items[0]] = {'size_g': items[3], 'vg': items[1]} lvs[items[0]] = {'size_g': items[3], 'vg': items[1]}
pvs_path = self.module.get_bin_path('pvs') pvs_path = self.module.get_bin_path('pvs')
@ -693,7 +693,7 @@ class LinuxHardware(Hardware):
if pvs_path: if pvs_path:
rc, pv_lines, err = self.module.run_command('%s %s' % (pvs_path, lvm_util_options)) rc, pv_lines, err = self.module.run_command('%s %s' % (pvs_path, lvm_util_options))
for pv_line in pv_lines.splitlines(): for pv_line in pv_lines.splitlines():
items = pv_line.split(',') items = pv_line.strip().split(',')
pvs[self._find_mapper_device_name(items[0])] = { pvs[self._find_mapper_device_name(items[0])] = {
'size_g': items[4], 'size_g': items[4],
'free_g': items[5], 'free_g': items[5],