1. devstack
  2. Commit d9b2f2a58ae75f38405ab9177b4341ea98f41f71
Browse code

Don't use deprecated nova libvirt conf names

libvirt_cpu_mode was renamed to libvirt.cpu_mode
libvirt_type was renamed to libvirt.virt_type

This patch is needed before I346ee0248c03e60716bd7dc4a5ee4493610867cb can
land.

Backported to stable/icehouse so that grenade will work, since we use
nova.conf set by old (stable/icehouse) when upgrading to new. Also this
config was deprecated in icehouse.

Change-Id: Ie8a39147ece3a3c86f4b146fa0af3641b1079319
(cherry picked from commit 1cd8efc89073a2867c8e2bd3a79d6887a180a590)

Joe Gordon authored on 2014/04/18 08:46:36
Showing 1 changed files
lib/nova_plugins/hypervisor-libvirt
History View file @ d9b2f2a
... ... 
@@ -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"