1. devstack
  2. Commit 79698041d0263d86d610f0f5b460c95aa6c4a3d3
Browse code

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

Jenkins authored on 2014/04/24 08:18:52
Showing 1 changed files
lib/nova_plugins/hypervisor-libvirt
History View file @ 7969804
... ... 
@@ -39,8 +39,8 @@ function cleanup_nova_hypervisor {
39 39 
 # configure_nova_hypervisor - Set config files, create data dirs, etc
40 40 
 function configure_nova_hypervisor {
41 41 
     configure_libvirt
42 
-    iniset $NOVA_CONF DEFAULT libvirt_type "$LIBVIRT_TYPE"
43 
-    iniset $NOVA_CONF DEFAULT libvirt_cpu_mode "none"
42 
+    iniset $NOVA_CONF libvirt virt_type "$LIBVIRT_TYPE"
43 
+    iniset $NOVA_CONF libvirt cpu_mode "none"
44 44 
     iniset $NOVA_CONF DEFAULT use_usb_tablet "False"
45 45 
     iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"
46 46 
     iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"