valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved down container check code below hypervisors to validate containers type running in virtual environment.

Browse Source 
Fixes #46754 & #43405
This commit is contained in:
Nageswar 2018-04-04 19:09:05 +00:00
parent 710f74c4a6
commit 7e704c0e81
No known key found for this signature in database
GPG Key ID: CC09EC69D666E568
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/grains/core.py
View File

@ -763,6 +763,7 @@ def _virtual(osdata):
# If a Dom0 or DomU was detected, obviously this is xen
if 'dom' in grains.get('virtual_subtype', '').lower():
grains['virtual'] = 'xen'
# Check container type after hypervisors, to avoid variable overwrite on containers running in virtual environment.
if os.path.isfile('/proc/1/cgroup'):
try:
with salt.utils.fopen('/proc/1/cgroup', 'r') as fhr: