From 1cd8efc89073a2867c8e2bd3a79d6887a180a590 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 17 Apr 2014 16:46:36 -0700 Subject: [PATCH] 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. Change-Id: Ie8a39147ece3a3c86f4b146fa0af3641b1079319 --- lib/nova_plugins/hypervisor-libvirt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt index 053df3cdf5..a8683307ac 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -39,8 +39,8 @@ function cleanup_nova_hypervisor { # 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"