summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-12 20:08:55 +0000
committerGerrit Code Review <review@openstack.org>2012-11-12 20:08:55 +0000
commitf0b67f77818fa8a0c0201212ba71344ebe7881cb (patch)
treee2ded563104fe325c647af42a9b08887d717718b
parent37d66b6732af9689d23c54a348c5986e42df15b0 (diff)
parent5d4cd7ea4fe36ff762a6426c58fceb03409d5729 (diff)
downloadnova-f0b67f77818fa8a0c0201212ba71344ebe7881cb.tar.gz
nova-f0b67f77818fa8a0c0201212ba71344ebe7881cb.tar.xz
nova-f0b67f77818fa8a0c0201212ba71344ebe7881cb.zip
Merge "Rename config to vconfig"
-rw-r--r--nova/virt/libvirt/driver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index c3e8c3114..6dae2589e 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -2357,7 +2357,7 @@ class LibvirtDriver(driver.ComputeDriver):
cpu.cores = info['topology']['cores']
cpu.threads = info['topology']['threads']
for f in info['features']:
- cpu.add_feature(config.LibvirtConfigCPUFeature(f))
+ cpu.add_feature(vconfig.LibvirtConfigCPUFeature(f))
u = "http://libvirt.org/html/libvirt-libvirt.html#virCPUCompareResult"
m = _("CPU doesn't have compatibility.\n\n%(ret)s\n\nRefer to %(u)s")