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

Merge pull request #13676 from basepi/cherrypick

Browse Source 
Do not unnecessarily recompile OpenVZ envId pattern
This commit is contained in:
Colton Myers 2014-06-24 11:49:33 -06:00
commit 4ea4995388
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/grains/core.py
View File

@ -530,8 +530,8 @@ def _virtual(osdata):
# Provide additional detection for OpenVZ # Provide additional detection for OpenVZ
if os.path.isfile('/proc/self/status'): if os.path.isfile('/proc/self/status'):
with salt.utils.fopen('/proc/self/status') as status_file: with salt.utils.fopen('/proc/self/status') as status_file:
vz_re = re.compile(r'^envID:\s+(\d+)$')
for line in status_file: for line in status_file:
vz_re = re.compile(r'^envID:\s+(\d+)$')
vz_match = vz_re.match(line.rstrip('\n')) vz_match = vz_re.match(line.rstrip('\n'))
if vz_match and int(vz_match.groups()[0]) != 0: if vz_match and int(vz_match.groups()[0]) != 0:
grains['virtual'] = 'openvzve' grains['virtual'] = 'openvzve'