saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[Fix] #57714 virtual grain should work on illumos

Browse source
This commit is contained in:
Jorge Schrauwen 2020-06-19 07:53:21 +02:00 • committed by Daniel Wozniak
parent ee073e66a8
commit 95eda904fc
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/57714.fixed Normal file
View file

@ -0,0 +1 @@
Due to some optimization the `virtual` grain was never updated on illumos. Move the fallback in prtdiag output parsing outside the loop that now gets skipped due to the command exiting non-zero.

22
salt/grains/core.py
View file

@ -919,16 +919,6 @@ def _virtual(osdata):
grains["virtual"] = "kvm"
elif "joyent smartdc hvm" in model:
grains["virtual"] = "kvm"
else:
# Check if it's a "regular" zone
zonename = salt.utils.path.which("zonename")
if zonename:
zone = __salt__["cmd.run"]("{0}".format(zonename))
if zone != "global":
grains["virtual"] = "zone"
# Check if it's a branded zone
elif os.path.isdir("/.SUNWnative"):
grains["virtual"] = "zone"
break
elif command == "virtinfo":
if output == "logical-domain":
@ -1121,6 +1111,18 @@ def _virtual(osdata):
):
if os.path.isfile("/var/run/xenconsoled.pid"):
grains["virtual_subtype"] = "Xen Dom0"
elif osdata["kernel"] == "SunOS":
# we did not get any data from virtinfo or prtdiag
# check the zonename here as fallback
zonename = salt.utils.path.which("zonename")
if zonename:
zone = __salt__["cmd.run"]("{0}".format(zonename))
if zone != "global":
grains["virtual"] = "zone"
# last ditch efford to check the brand identifier
elif os.path.isdir("/.SUNWnative"):
grains["virtual"] = "zone"
# If we have a virtual_subtype, we're virtual, but maybe we couldn't
# figure out what specific virtual type we were?