diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-02 06:21:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-02 06:21:31 +0000 |
| commit | 9c3502e13a007825dd87da3912ecf2e24c4033bb (patch) | |
| tree | f19dba759c567f383fc650d3362765edcae5ffe8 | |
| parent | 8c29803bb9756ad1a9d2fc6a43ca078588a3c9aa (diff) | |
| parent | eea1deae5dab23fba0be0039f491ff9fc2cd9ff2 (diff) | |
| download | nova-9c3502e13a007825dd87da3912ecf2e24c4033bb.tar.gz nova-9c3502e13a007825dd87da3912ecf2e24c4033bb.tar.xz nova-9c3502e13a007825dd87da3912ecf2e24c4033bb.zip | |
Merge "Fix to correctly report memory on Linux 3.X."
| -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() |