[backport 2.9] facts: detect FreeBSD jails guest (#62857) (#62913)

* facts: detect FreeBSD jails guest (#62857)

* facts: detect FreeBSD jails

* PEP8 fix

* changelog for pr62913
pull/64281/head
dgeo 6 years ago committed by Toshio Kuratomi
parent a0fb10c2ab
commit a72a25d191

@ -0,0 +1,2 @@
bugfixes:
- facts/virtual #62857 detect FreeBSD jails guest

@ -41,7 +41,8 @@ class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
virtual_facts['virtualization_role'] = 'guest'
if virtual_facts['virtualization_type'] == '':
virtual_product_facts = self.detect_virt_product('kern.vm_guest') or self.detect_virt_product('hw.hv_vendor')
virtual_product_facts = self.detect_virt_product('kern.vm_guest') or self.detect_virt_product(
'hw.hv_vendor') or self.detect_virt_product('security.jail.jailed')
virtual_facts.update(virtual_product_facts)
if virtual_facts['virtualization_type'] == '':

@ -48,6 +48,9 @@ class VirtualSysctlDetectionMixin(object):
elif out.rstrip() == 'RHEV Hypervisor':
virtual_product_facts['virtualization_type'] = 'RHEV'
virtual_product_facts['virtualization_role'] = 'guest'
elif (key == 'security.jail.jailed') and (out.rstrip() == '1'):
virtual_product_facts['virtualization_type'] = 'jails'
virtual_product_facts['virtualization_role'] = 'guest'
return virtual_product_facts

Loading…
Cancel
Save