1. devstack
  2. Commit 51c681d6054d875dd9e01fa152fc8d44ad8a9c0b
Browse code

Add support for deprecated configuration vars in Juno

Just like the beginning of every other release, remove the deprecated
config option aliases that were marked as deprecated in Icehouse.

Nova patch - https://review.openstack.org/#/c/88456/

Change-Id: Idd051c516002030e8e191c7b8d31f1ff408e1c7d

Gary Kotton authored on 2014/04/22 17:40:56
Showing 4 changed files
lib/neutron
History View file @ 51c681d
... ... 
@@ -316,7 +316,7 @@ function create_nova_conf_neutron {
316 316 
     # set NOVA_VIF_DRIVER and optionally set options in nova_conf
317 317 
     neutron_plugin_create_nova_conf
318 318
319 
-    iniset $NOVA_CONF DEFAULT libvirt_vif_driver "$NOVA_VIF_DRIVER"
319 
+    iniset $NOVA_CONF libvirt vif_driver "$NOVA_VIF_DRIVER"
320 320 
     iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"
321 321 
     if is_service_enabled q-meta; then
322 322 
         iniset $NOVA_CONF DEFAULT service_neutron_metadata_proxy "True"
lib/neutron_plugins/openvswitch_agent
History View file @ 51c681d
... ... 
@@ -10,8 +10,8 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base
10 10 
 function neutron_plugin_create_nova_conf {
11 11 
     _neutron_ovs_base_configure_nova_vif_driver
12 12 
     if [ "$VIRT_DRIVER" = 'xenserver' ]; then
13 
-        iniset $NOVA_CONF DEFAULT xenapi_vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
14 
-        iniset $NOVA_CONF DEFAULT xenapi_ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
13 
+        iniset $NOVA_CONF xenserver vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
14 
+        iniset $NOVA_CONF xenserver ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
15 15 
         # Disable nova's firewall so that it does not conflict with neutron
16 16 
         iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
17 17 
     fi
lib/nova_plugins/hypervisor-baremetal
History View file @ 51c681d
... ... 
@@ -49,7 +49,7 @@ function configure_nova_hypervisor {
49 49 
     iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager
50 50 
     iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
51 51 
     iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
52 
-    iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH
52 
+    iniset $NOVA_CONF baremetal flavor_extra_specs cpu_arch:$BM_CPU_ARCH
53 53 
     iniset $NOVA_CONF baremetal driver $BM_DRIVER
54 54 
     iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER
55 55 
     iniset $NOVA_CONF baremetal tftp_root /tftpboot
lib/nova_plugins/hypervisor-libvirt
History View file @ 51c681d
... ... 
@@ -41,7 +41,7 @@ function configure_nova_hypervisor {
41 41 
     configure_libvirt
42 42 
     iniset $NOVA_CONF libvirt virt_type "$LIBVIRT_TYPE"
43 43 
     iniset $NOVA_CONF libvirt cpu_mode "none"
44 
-    iniset $NOVA_CONF DEFAULT use_usb_tablet "False"
44 
+    iniset $NOVA_CONF libvirt use_usb_tablet "False"
45 45 
     iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"
46 46 
     iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
47 47 
     LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}