diff options
| author | Mandell Degerness <mdegerne@gmail.com> | 2011-11-21 23:54:36 +0000 |
|---|---|---|
| committer | Mandell Degerness <mdegerne@gmail.com> | 2011-12-01 20:54:40 +0000 |
| commit | eea1deae5dab23fba0be0039f491ff9fc2cd9ff2 (patch) | |
| tree | dcec81f7f28684c66a4623911d0b60316544b2c6 | |
| parent | b44dc5cb34806157ab1e3e3389ddc79594a90e75 (diff) | |
| download | nova-eea1deae5dab23fba0be0039f491ff9fc2cd9ff2.tar.gz nova-eea1deae5dab23fba0be0039f491ff9fc2cd9ff2.tar.xz nova-eea1deae5dab23fba0be0039f491ff9fc2cd9ff2.zip | |
Fix to correctly report memory on Linux 3.X.
If sys is compiled on a Linux 3.X system, it returns LINUX3 instead of
LINUX2 for sys.platform.upper().
Change-Id: I78dae37d4facbaf6513c0eab651b1a06b93949b2
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 437203e46..edaa11cbb 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -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() |