Merge "Fix to correctly report memory on Linux 3.X."
This commit is contained in:
commit
9c3502e13a
|
@ -1323,7 +1323,7 @@ class LibvirtConnection(driver.ComputeDriver):
|
|||
|
||||
"""
|
||||
|
||||
if sys.platform.upper() != 'LINUX2':
|
||||
if sys.platform.upper() not in ['LINUX2', 'LINUX3']:
|
||||
return 0
|
||||
|
||||
meminfo = open('/proc/meminfo').read().split()
|
||||
|
@ -1364,7 +1364,7 @@ class LibvirtConnection(driver.ComputeDriver):
|
|||
|
||||
"""
|
||||
|
||||
if sys.platform.upper() != 'LINUX2':
|
||||
if sys.platform.upper() not in ['LINUX2', 'LINUX3']:
|
||||
return 0
|
||||
|
||||
m = open('/proc/meminfo').read().split()
|
||||
|
|
Loading…
Reference in New Issue