commit 79698041d0263d86d610f0f5b460c95aa6c4a3d3
author Jenkins <jenkins@review.openstack.org> Wed Apr 23 23:18:52 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Apr 23 23:18:52 2014 +0000
tree 2b9b63e8e1d08e5ec3dc39896c181d1bc54620d6
parent dce6ff3071ead0377ef21bdc679b7444a614f11a
parent 1cd8efc89073a2867c8e2bd3a79d6887a180a590

Merge "Don't use deprecated nova libvirt conf names"

lib/nova_plugins/hypervisor-libvirt

diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index 053df3c..a868330 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -39,8 +39,8 @@
 # configure_nova_hypervisor - Set config files, create data dirs, etc
 function configure_nova_hypervisor {
     configure_libvirt
-    iniset $NOVA_CONF DEFAULT libvirt_type "$LIBVIRT_TYPE"
-    iniset $NOVA_CONF DEFAULT libvirt_cpu_mode "none"
+    iniset $NOVA_CONF libvirt virt_type "$LIBVIRT_TYPE"
+    iniset $NOVA_CONF libvirt cpu_mode "none"
     iniset $NOVA_CONF DEFAULT use_usb_tablet "False"
     iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"
     iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"