Browse code
Remove NOVA_VIF_DRIVER variable
Commit 7561c8ded211d53e8745d1420a73b82bd0fc35cf removed the
libvirt.vif_driver option from Nova in Juno so we should remove the
variable from devstack since it's useless / confusing.
Change-Id: I70a8cb4a3606eb5eabd3c0ef331945e72c80543a
Matt Riedemann authored on 2015/08/26 05:40:25Showing 6 changed files
- lib/neutron-legacy
- lib/neutron_plugins/README.md
- lib/neutron_plugins/brocade
- lib/neutron_plugins/ibm
- lib/neutron_plugins/nuage
- lib/neutron_plugins/oneconvergence
| ... | ... |
@@ -158,8 +158,6 @@ Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
|
| 158 | 158 |
Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False}
|
| 159 | 159 |
# The name of the default q-l3 router |
| 160 | 160 |
Q_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"}
|
|
| 163 | 161 |
Q_NOTIFY_NOVA_PORT_STATUS_CHANGES=${Q_NOTIFY_NOVA_PORT_STATUS_CHANGES:-True}
|
| 164 | 162 |
Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}
|
| 165 | 163 |
VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}
|
| ... | ... |
@@ -485,10 +483,9 @@ function create_nova_conf_neutron {
|
| 485 | 485 |
iniset $NOVA_CONF DEFAULT security_group_api neutron |
| 486 | 486 |
fi |
| 487 | 487 |
|
| 488 |
- # set NOVA_VIF_DRIVER and optionally set options in nova_conf |
|
| 488 |
+ # optionally set options in nova_conf |
|
| 489 | 489 |
neutron_plugin_create_nova_conf |
| 490 | 490 |
|
| 491 |
- iniset $NOVA_CONF libvirt vif_driver "$NOVA_VIF_DRIVER" |
|
| 492 | 491 |
iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER" |
| 493 | 492 |
if is_service_enabled q-meta; then |
| 494 | 493 |
iniset $NOVA_CONF neutron service_metadata_proxy "True" |
| ... | ... |
@@ -16,9 +16,7 @@ functions |
| 16 | 16 |
``lib/neutron-legacy`` calls the following functions when the ``$Q_PLUGIN`` is enabled |
| 17 | 17 |
|
| 18 | 18 |
* ``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 |
|
| 22 | 20 |
* ``neutron_plugin_install_agent_packages`` : |
| 23 | 21 |
install packages that is specific to plugin agent |
| 24 | 22 |
e.g. |
| ... | ... |
@@ -42,7 +42,6 @@ function neutron_setup_integration_bridge {
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
function neutron_plugin_create_nova_conf {
|
| 45 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 46 | 45 |
# if n-cpu is enabled, then setup integration bridge |
| 47 | 46 |
if is_service_enabled n-cpu; then |
| 48 | 47 |
neutron_setup_integration_bridge |
| ... | ... |
@@ -10,7 +10,6 @@ set +o xtrace |
| 10 | 10 |
function neutron_plugin_create_nova_conf {
|
| 11 | 11 |
NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:-"br-int"}
|
| 12 | 12 |
iniset $NOVA_CONF neutron ovs_bridge $NOVA_OVS_BRIDGE |
| 13 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 14 | 13 |
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver |
| 15 | 14 |
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
| 16 | 15 |
} |
| ... | ... |
@@ -68,7 +68,6 @@ function neutron_plugin_configure_plugin_agent {
|
| 68 | 68 |
} |
| 69 | 69 |
|
| 70 | 70 |
function neutron_plugin_create_nova_conf {
|
| 71 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 72 | 71 |
if ( is_service_enabled n-cpu && ! ( is_service_enabled q-dhcp )) ; then |
| 73 | 72 |
setup_integration_bridge |
| 74 | 73 |
fi |