diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2018-02-12 10:21:10 -0500 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2018-02-14 15:54:07 -0500 |
| commit | 41c6415941870cb235b24fbba2be0e8deacdcfe3 (patch) | |
| tree | 2d933c2f847f4e95b5c57af7bbbbacf7280543b6 | |
| parent | 5f46773151862bd28feba36633303bbf20b61e97 (diff) | |
| download | ansible-41c6415941870cb235b24fbba2be0e8deacdcfe3.tar.gz | |
fixes to virtual facts
fixes #36038
(cherry picked from commit 97b6e99479178addf21c380c1b653f734ddb0cea)
| -rw-r--r-- | lib/ansible/module_utils/facts/virtual/linux.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/module_utils/facts/virtual/linux.py b/lib/ansible/module_utils/facts/virtual/linux.py index a2b41b30b6..a0ad54584b 100644 --- a/lib/ansible/module_utils/facts/virtual/linux.py +++ b/lib/ansible/module_utils/facts/virtual/linux.py @@ -154,9 +154,9 @@ class LinuxVirtual(Virtual): if os.path.exists('/proc/self/status'): for line in get_file_lines('/proc/self/status'): - if re.match(r'^VxID: \d+', line): + if re.match(r'^VxID:\s+\d+', line): virtual_facts['virtualization_type'] = 'linux_vserver' - if re.match(r'^VxID: 0', line): + if re.match(r'^VxID:\s+0', line): virtual_facts['virtualization_role'] = 'host' else: virtual_facts['virtualization_role'] = 'guest' @@ -212,7 +212,7 @@ class LinuxVirtual(Virtual): if open(f).read().rstrip() == 'vdsm': virtual_facts['virtualization_type'] = 'RHEV' break - except: + except Exception: pass else: virtual_facts['virtualization_type'] = 'kvm' |