diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-09-13 20:50:47 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-09-14 00:01:01 -0700 |
| commit | 02094eed711c53fed218e741a3aa8014a544e860 (patch) | |
| tree | 897d712e92bc5f0d1d78d1d33af6d849f31690a2 | |
| parent | 83a74213b1c043c438e92de201a32d5e09c937fb (diff) | |
| download | ansible-02094eed711c53fed218e741a3aa8014a544e860.tar.gz | |
Fix regression in format of lvm facts (#30326)
lvm information should not have leading whitespace in the key names
Fixes #30006
(cherry picked from commit 62f49120cd1c0e7af9d71b8da14b0bc9b21b05ed)
| -rw-r--r-- | lib/ansible/module_utils/facts/hardware/linux.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/module_utils/facts/hardware/linux.py b/lib/ansible/module_utils/facts/hardware/linux.py index 449b0e855f..95b03355d3 100644 --- a/lib/ansible/module_utils/facts/hardware/linux.py +++ b/lib/ansible/module_utils/facts/hardware/linux.py @@ -671,7 +671,7 @@ class LinuxHardware(Hardware): if vgs_path: rc, vg_lines, err = self.module.run_command('%s %s' % (vgs_path, lvm_util_options)) for vg_line in vg_lines.splitlines(): - items = vg_line.split(',') + items = vg_line.strip().split(',') vgs[items[0]] = {'size_g': items[-2], 'free_g': items[-1], 'num_lvs': items[2], @@ -684,7 +684,7 @@ class LinuxHardware(Hardware): if lvs_path: rc, lv_lines, err = self.module.run_command('%s %s' % (lvs_path, lvm_util_options)) 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]} pvs_path = self.module.get_bin_path('pvs') @@ -693,7 +693,7 @@ class LinuxHardware(Hardware): if pvs_path: rc, pv_lines, err = self.module.run_command('%s %s' % (pvs_path, lvm_util_options)) for pv_line in pv_lines.splitlines(): - items = pv_line.split(',') + items = pv_line.strip().split(',') pvs[self._find_mapper_device_name(items[0])] = { 'size_g': items[4], 'free_g': items[5], |