Merge "Neutron-legacy: Remove LINUXNET_VIF_DRIVER option"

This commit is contained in:
Jenkins 2015-11-14 02:51:49 +00:00 committed by Gerrit Code Review
commit d9da93ede2

View File

@ -486,7 +486,6 @@ function create_nova_conf_neutron {
# optionally set options in nova_conf # optionally set options in nova_conf
neutron_plugin_create_nova_conf neutron_plugin_create_nova_conf
iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"
if is_service_enabled q-meta; then if is_service_enabled q-meta; then
iniset $NOVA_CONF neutron service_metadata_proxy "True" iniset $NOVA_CONF neutron service_metadata_proxy "True"
fi fi