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

Merge branch '2019.2.1' into bp-52780

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-05-06 09:14:09 -07:00 • committed by GitHub
commit 226c7ce85b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -1341,6 +1341,8 @@ def _windows_platform_data():
grains['virtual_subtype'] = 'HVM domU'
elif 'OpenStack' in systeminfo.Model:
grains['virtual'] = 'OpenStack'
elif 'AMAZON' in biosinfo.Version:
grains['virtual'] = 'EC2'
return grains