diff options
| author | Martin Nečas <necas.marty@gmail.com> | 2021-08-04 21:47:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 14:47:13 -0500 |
| commit | 626a8a29af3e8984b2a7435a713f691924b584b6 (patch) | |
| tree | bf5833b9c055c7b66829b076672e102f46528a41 | |
| parent | b2c1e26d4c170632d11a90d2e804791643e0ee40 (diff) | |
| download | ansible-626a8a29af3e8984b2a7435a713f691924b584b6.tar.gz | |
Backport 2.9: Setup virtualization_facts - add RHV and oVirt type (#73903)
* Setup virtualization_facts - add RHV and oVirt type
* initialize sys_vendor only once
* add changelog
* Update 72876-setup-facts-add-redhat-vendor.yml
* Update linux.py
* Change only RHV virtualization_type
* Update 72876-setup-facts-add-redhat-vendor.yml
| -rw-r--r-- | changelogs/fragments/72876-setup-facts-add-redhat-vendor.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/module_utils/facts/virtual/linux.py | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/changelogs/fragments/72876-setup-facts-add-redhat-vendor.yml b/changelogs/fragments/72876-setup-facts-add-redhat-vendor.yml new file mode 100644 index 0000000000..1a1410d76d --- /dev/null +++ b/changelogs/fragments/72876-setup-facts-add-redhat-vendor.yml @@ -0,0 +1,2 @@ +bugfixes: +- "Setup virtualization_facts - add RHV type. This change will fully work for VMs in clusters at cluster level 4.4 or newer (https://github.com/ansible/ansible/pull/72876)." diff --git a/lib/ansible/module_utils/facts/virtual/linux.py b/lib/ansible/module_utils/facts/virtual/linux.py index 65e828b741..a92b661b6a 100644 --- a/lib/ansible/module_utils/facts/virtual/linux.py +++ b/lib/ansible/module_utils/facts/virtual/linux.py @@ -84,14 +84,20 @@ class LinuxVirtual(Virtual): virtual_facts['virtualization_role'] = 'guest' product_name = get_file_content('/sys/devices/virtual/dmi/id/product_name') + sys_vendor = get_file_content('/sys/devices/virtual/dmi/id/sys_vendor') + product_family = get_file_content('/sys/devices/virtual/dmi/id/product_family') if product_name in ('KVM', 'Bochs'): virtual_facts['virtualization_type'] = 'kvm' return virtual_facts - if product_name == 'RHEV Hypervisor': - virtual_facts['virtualization_type'] = 'RHEV' - return virtual_facts + if sys_vendor == 'Red Hat': + if product_family == 'RHV': + virtual_facts['virtualization_type'] = 'RHV' + return virtual_facts + elif product_name == 'RHEV Hypervisor': + virtual_facts['virtualization_type'] = 'RHEV' + return virtual_facts if product_name in ('VMware Virtual Platform', 'VMware7,1'): virtual_facts['virtualization_type'] = 'VMware' @@ -115,8 +121,6 @@ class LinuxVirtual(Virtual): virtual_facts['virtualization_type'] = 'kvm' return virtual_facts - sys_vendor = get_file_content('/sys/devices/virtual/dmi/id/sys_vendor') - KVM_SYS_VENDORS = ('QEMU', 'oVirt', 'Amazon EC2', 'Google', 'Scaleway') if sys_vendor in KVM_SYS_VENDORS: virtual_facts['virtualization_type'] = 'kvm' |