File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -158,8 +158,6 @@ Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
158158Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:- False}
159159# The name of the default q-l3 router
160160Q_ROUTER_NAME=${Q_ROUTER_NAME:- router1}
161- # nova vif driver that all plugins should use
162- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:- " nova.virt.libvirt.vif.LibvirtGenericVIFDriver" }
163161Q_NOTIFY_NOVA_PORT_STATUS_CHANGES=${Q_NOTIFY_NOVA_PORT_STATUS_CHANGES:- True}
164162Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:- True}
165163VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:- True}
@@ -485,10 +483,9 @@ function create_nova_conf_neutron {
485483 iniset $NOVA_CONF DEFAULT security_group_api neutron
486484 fi
487485
488- # set NOVA_VIF_DRIVER and optionally set options in nova_conf
486+ # optionally set options in nova_conf
489487 neutron_plugin_create_nova_conf
490488
491- iniset $NOVA_CONF libvirt vif_driver " $NOVA_VIF_DRIVER "
492489 iniset $NOVA_CONF DEFAULT linuxnet_interface_driver " $LINUXNET_VIF_DRIVER "
493490 if is_service_enabled q-meta; then
494491 iniset $NOVA_CONF neutron service_metadata_proxy " True"
Original file line number Diff line number Diff line change @@ -16,9 +16,7 @@ functions
1616`` lib/neutron-legacy `` calls the following functions when the `` $Q_PLUGIN `` is enabled
1717
1818* `` neutron_plugin_create_nova_conf `` :
19- set `` NOVA_VIF_DRIVER `` and optionally set options in nova_conf
20- e.g.
21- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
19+ optionally set options in nova_conf
2220* `` neutron_plugin_install_agent_packages `` :
2321 install packages that is specific to plugin agent
2422 e.g.
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ function is_neutron_ovs_base_plugin {
1212}
1313
1414function neutron_plugin_create_nova_conf {
15- NOVA_VIF_DRIVER= ${NOVA_VIF_DRIVER :- " nova.virt.libvirt.vif.LibvirtGenericVIFDriver " }
15+ :
1616}
1717
1818function neutron_plugin_install_agent_packages {
Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ function neutron_setup_integration_bridge {
4242}
4343
4444function neutron_plugin_create_nova_conf {
45- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:- " nova.virt.libvirt.vif.LibvirtGenericVIFDriver" }
4645 # if n-cpu is enabled, then setup integration bridge
4746 if is_service_enabled n-cpu; then
4847 neutron_setup_integration_bridge
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ set +o xtrace
1010function neutron_plugin_create_nova_conf {
1111 NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:- " br-int" }
1212 iniset $NOVA_CONF neutron ovs_bridge $NOVA_OVS_BRIDGE
13- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:- " nova.virt.libvirt.vif.LibvirtGenericVIFDriver" }
1413 LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
1514 iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
1615}
Original file line number Diff line number Diff line change @@ -68,7 +68,6 @@ function neutron_plugin_configure_plugin_agent {
6868}
6969
7070function neutron_plugin_create_nova_conf {
71- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:- " nova.virt.libvirt.vif.LibvirtGenericVIFDriver" }
7271 if ( is_service_enabled n-cpu && ! ( is_service_enabled q-dhcp )) ; then
7372 setup_integration_bridge
7473 fi
You can’t perform that action at this time.
0 commit comments