ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-28 15:41:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

simplified logic paths

Browse source
This commit is contained in:
Brian Coca 2016-08-26 11:39:12 -04:00
commit 1139d61d59
1 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3173,12 +3173,14 @@ class OpenBSDVirtual(Virtual):
def get_virtual_facts(self):
sysctl_path = self.module.get_bin_path('sysctl')
if sysctl_path:
rc, out, err = self.module.run_command("%s -n hw.product" % sysctl_path)
if rc != 0:
# Set empty values as default
self.facts['virtualization_type'] = ''
self.facts['virtualization_role'] = ''
elif re.match('(KVM|Bochs|SmartDC).*', out):
if sysctl_path:
rc, out, err = self.module.run_command("%s -n hw.product" % sysctl_path)
if rc == 0:
if re.match('(KVM|Bochs|SmartDC).*', out):
self.facts['virtualization_type'] = 'kvm'
self.facts['virtualization_role'] = 'guest'
elif re.match('.*VMware.*', out):
@ -3199,21 +3201,10 @@ class OpenBSDVirtual(Virtual):
else:
# Try harder and see if hw.vendor has anything we could use.
rc, out, err = self.module.run_command("%s -n hw.vendor" % sysctl_path)
if rc != 0:
self.facts['virtualization_type'] = ''
self.facts['virtualization_role'] = ''
elif out.rstrip() == 'QEMU':
if rc == 0:
if out.rstrip() == 'QEMU':
self.facts['virtualization_type'] = 'kvm'
self.facts['virtualization_role'] = 'guest'
else:
# Set empty values if we find no match at all.
self.facts['virtualization_type'] = ''
self.facts['virtualization_role'] = ''
else:
# Set empty values if we find no sysctl binary.
self.facts['virtualization_type'] = ''
self.facts['virtualization_role'] = ''
class HPUXVirtual(Virtual):
"""