@@ -316,7 +316,7 @@ function create_nova_conf_neutron {

     # set NOVA_VIF_DRIVER and optionally set options in nova_conf

     neutron_plugin_create_nova_conf

-    iniset $NOVA_CONF DEFAULT libvirt_vif_driver "$NOVA_VIF_DRIVER"

+    iniset $NOVA_CONF libvirt vif_driver "$NOVA_VIF_DRIVER"

     iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"

     if is_service_enabled q-meta; then

         iniset $NOVA_CONF DEFAULT service_neutron_metadata_proxy "True"

@@ -10,8 +10,8 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base

 function neutron_plugin_create_nova_conf {

     _neutron_ovs_base_configure_nova_vif_driver

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

-        iniset $NOVA_CONF DEFAULT xenapi_vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver

-        iniset $NOVA_CONF DEFAULT xenapi_ovs_integration_bridge $XEN_INTEGRATION_BRIDGE

+        iniset $NOVA_CONF xenserver vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver

+        iniset $NOVA_CONF xenserver ovs_integration_bridge $XEN_INTEGRATION_BRIDGE

         # Disable nova's firewall so that it does not conflict with neutron

         iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver

     fi

@@ -49,7 +49,7 @@ function configure_nova_hypervisor {

     iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager

     iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0

     iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0

-    iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH

+    iniset $NOVA_CONF baremetal flavor_extra_specs cpu_arch:$BM_CPU_ARCH

     iniset $NOVA_CONF baremetal driver $BM_DRIVER

     iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER

     iniset $NOVA_CONF baremetal tftp_root /tftpboot

@@ -41,7 +41,7 @@ function configure_nova_hypervisor {

     configure_libvirt

     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 libvirt use_usb_tablet "False"

     iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"

     iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"

     LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}