Skip to content

Correctly detect Nutanix AHV as virtual #62387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rolo9707 wants to merge 5 commits into from
Closed

Correctly detect Nutanix AHV as virtual #62387

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab52469
Update core.py
rolo9707 Jul 26, 2022
fc8fc36
Merge branch 'master' into patch-1
rolo9707 Aug 3, 2022
9faf6df
Nutanix AHV added to grains.virtual on several guest OS'es
rolo9707 Aug 3, 2022
cd24a94
Merge branch 'master' into patch-1
rolo9707 Aug 16, 2022
df18cfd
Merge branch 'master' into patch-1
rolo9707 Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion salt/grains/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,9 @@ def _windows_virtual(osdata):
elif "CloudStack KVM Hypervisor" in productname:
grains["virtual"] = "kvm"
grains["virtual_subtype"] = "cloudstack"
# Nutanix AHV
elif "AHV" in productname:
grains["virtual"] = "Nutanix"
return grains


Expand All @@ -747,10 +750,12 @@ def _virtual(osdata):
# list of commands to be executed to determine the 'virtual' grain
_cmds = ["systemd-detect-virt", "virt-what", "dmidecode"]
# test first for virt-what, which covers most of the desired functionality
# on most platforms
# on most platforms. next, test for dmidecode.
if not salt.utils.platform.is_windows() and osdata["kernel"] not in skip_cmds:
if salt.utils.path.which("virt-what"):
_cmds = ["virt-what"]
elif salt.utils.path.which("dmidecode"):
_cmds = ["dmidecode"]

# Check if enable_lspci is True or False
if __opts__.get("enable_lspci", True) is True:
Expand Down Expand Up @@ -878,6 +883,10 @@ def _virtual(osdata):
elif "hyperv" in line:
grains["virtual"] = "HyperV"
break
# Nutanix AHV
elif "nutanix_ahv" in line:
grains["virtual"] = "Nutanix"
break
break
elif command == "dmidecode":
# Product Name: VirtualBox
Expand Down Expand Up @@ -915,6 +924,9 @@ def _virtual(osdata):
grains["virtual"] = "Parallels"
elif "Manufacturer: Google" in output:
grains["virtual"] = "kvm"
# Nutanix AHV
elif "Manufacturer: Nutanix" in output:
grains["virtual"] = "Nutanix"
# Proxmox KVM
elif "Vendor: SeaBIOS" in output:
grains["virtual"] = "kvm"
Expand All @@ -932,6 +944,9 @@ def _virtual(osdata):
grains["virtual"] = "VirtualBox"
elif "qemu" in model:
grains["virtual"] = "kvm"
# Nutanix AHV
elif "nutanix" in model:
grains["virtual"] = "Nutanix"
elif "virtio" in model:
grains["virtual"] = "kvm"
# Break out of the loop so the next log message is not issued
Expand Down Expand Up @@ -1055,6 +1070,9 @@ def _virtual(osdata):
grains["virtual"] = "gce"
elif "BHYVE" in output:
grains["virtual"] = "bhyve"
# Nutanix AHV
elif "AHV" in output:
grains["virtual"] = "Nutanix"
except UnicodeDecodeError:
# Some firmwares provide non-valid 'product_name'
# files, ignore them
Expand Down