virt facts: allow guest/host to have >1 virt tech

changelogs/fragments/multivirt.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - New virtualization facts, ``virtualization_tech_guest`` and ``virtualization_tech_host`` now allow for conveying when a system is a host or guest of multiple virtualization technologies.

docs/docsite/rst/porting_guides/porting_guide_base_2.11.rst

@@ -131,7 +131,8 @@ No notable changes
 Noteworthy module changes
 -------------------------
 
-* facts - ``ansible_virtualization_type`` now tries to report a more accurate result than ``xen`` when virtualized and not running on Xen.
+* facts - On NetBSD, ``ansible_virtualization_type`` now tries to report a more accurate result than ``xen`` when virtualized and not running on Xen.
+* facts - Virtualization facts now include ``virtualization_tech_guest`` and ``virtualization_tech_host`` keys. These are lists of virtualization technologies that a guest is a part of, or that a host provides, respectively. As an example, a host may be set up to provide both KVM and VirtualBox, and these will be included in ``virtualization_tech_host``, and a podman container running on a VM powered by KVM will have a ``virtualization_tech_guest`` of ``["kvm", "podman", "container"]``.
 
 
 Plugins

lib/ansible/module_utils/facts/virtual/base.py

@@ -46,16 +46,24 @@ def populate(self, collected_facts=None):
         return virtual_facts
 
     def get_virtual_facts(self):
-        virtual_facts = {'virtualization_type': '',
-                         'virtualization_role': ''}
+        virtual_facts = {
+            'virtualization_type': '',
+            'virtualization_role': '',
+            'virtualization_tech_guest': set(),
+            'virtualization_tech_host': set(),
+        }
         return virtual_facts
 
 
 class VirtualCollector(BaseFactCollector):
     name = 'virtual'
     _fact_class = Virtual
-    _fact_ids = set(['virtualization_type',
-                     'virtualization_role'])
+    _fact_ids = set([
+        'virtualization_type',
+        'virtualization_role',
+        'virtualization_tech_guest',
+        'virtualization_tech_host',
+    ])
 
     def collect(self, module=None, collected_facts=None):
         collected_facts = collected_facts or {}

lib/ansible/module_utils/facts/virtual/freebsd.py

@@ -32,23 +32,45 @@ class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
 
     def get_virtual_facts(self):
         virtual_facts = {}
+        host_tech = set()
+        guest_tech = set()
+
         # Set empty values as default
         virtual_facts['virtualization_type'] = ''
         virtual_facts['virtualization_role'] = ''
 
         if os.path.exists('/dev/xen/xenstore'):
+            guest_tech.add('xen')
             virtual_facts['virtualization_type'] = 'xen'
             virtual_facts['virtualization_role'] = 'guest'
 
+        kern_vm_guest = self.detect_virt_product('kern.vm_guest')
+        guest_tech.update(kern_vm_guest['virtualization_tech_guest'])
+        host_tech.update(kern_vm_guest['virtualization_tech_host'])
+
+        hw_hv_vendor = self.detect_virt_product('hw.hv_vendor')
+        guest_tech.update(hw_hv_vendor['virtualization_tech_guest'])
+        host_tech.update(hw_hv_vendor['virtualization_tech_host'])
+
+        sec_jail_jailed = self.detect_virt_product('security.jail.jailed')
+        guest_tech.update(sec_jail_jailed['virtualization_tech_guest'])
+        host_tech.update(sec_jail_jailed['virtualization_tech_host'])
+
         if virtual_facts['virtualization_type'] == '':
-            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)
+            sysctl = kern_vm_guest or hw_hv_vendor or sec_jail_jailed
+            # We call update here, then re-set virtualization_tech_host/guest
+            # later.
+            virtual_facts.update(sysctl)
+
+        virtual_vendor_facts = self.detect_virt_vendor('hw.model')
+        guest_tech.update(virtual_vendor_facts['virtualization_tech_guest'])
+        host_tech.update(virtual_vendor_facts['virtualization_tech_host'])
 
         if virtual_facts['virtualization_type'] == '':
-            virtual_vendor_facts = self.detect_virt_vendor('hw.model')
             virtual_facts.update(virtual_vendor_facts)
 
+        virtual_facts['virtualization_tech_guest'] = guest_tech
+        virtual_facts['virtualization_tech_host'] = host_tech
         return virtual_facts
 
 

lib/ansible/module_utils/facts/virtual/hpux.py

@@ -32,28 +32,38 @@ class HPUXVirtual(Virtual):
 
     def get_virtual_facts(self):
         virtual_facts = {}
+        host_tech = set()
+        guest_tech = set()
+
         if os.path.exists('/usr/sbin/vecheck'):
             rc, out, err = self.module.run_command("/usr/sbin/vecheck")
             if rc == 0:
+                guest_tech.add('HP vPar')
                 virtual_facts['virtualization_type'] = 'guest'
                 virtual_facts['virtualization_role'] = 'HP vPar'
         if os.path.exists('/opt/hpvm/bin/hpvminfo'):
             rc, out, err = self.module.run_command("/opt/hpvm/bin/hpvminfo")
             if rc == 0 and re.match('.*Running.*HPVM vPar.*', out):
+                guest_tech.add('HPVM vPar')
                 virtual_facts['virtualization_type'] = 'guest'
                 virtual_facts['virtualization_role'] = 'HPVM vPar'
             elif rc == 0 and re.match('.*Running.*HPVM guest.*', out):
+                guest_tech.add('HPVM IVM')
                 virtual_facts['virtualization_type'] = 'guest'
                 virtual_facts['virtualization_role'] = 'HPVM IVM'
             elif rc == 0 and re.match('.*Running.*HPVM host.*', out):
+                guest_tech.add('HPVM')
                 virtual_facts['virtualization_type'] = 'host'
                 virtual_facts['virtualization_role'] = 'HPVM'
         if os.path.exists('/usr/sbin/parstatus'):
             rc, out, err = self.module.run_command("/usr/sbin/parstatus")
             if rc == 0:
+                guest_tech.add('HP nPar')
                 virtual_facts['virtualization_type'] = 'guest'
                 virtual_facts['virtualization_role'] = 'HP nPar'
 
+        virtual_facts['virtualization_tech_guest'] = guest_tech
+        virtual_facts['virtualization_tech_host'] = host_tech
         return virtual_facts