openstack
/
neutron
Code Issues Proposed changes

Remove functions which enable Neutron's QoS service 

Those functions were part of the neutron devstack plugin but we
discussed it during last PTG [1] and decided to move to the Devstack
repo plugins which are used by e.g. CI jobs which are defined outside
of the neutron repository.
QoS service is used e.g. in the tempest-slow job which is
defined in tempest and used by many different OpenStack projects.

[1] https://etherpad.opendev.org/p/neutron-yoga-ptg#L142

Depends-On: https://review.opendev.org/c/openstack/devstack/+/815686
Depends-On: https://review.opendev.org/c/openstack/devstack/+/818355
Change-Id: I7b70d6281d551a88080c6e727e2485079ba5c061
This commit is contained in:
Slawek Kaplonski 2021-10-27 16:51:26 +02:00
parent 770b64b90e
commit cf8fa0d42d
5 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/l2_agent
View File

@ -1,13 +1,3 @@
function plugin_agent_add_l2_agent_extension {
local l2_agent_extension=$1
if [[ -z "$L2_AGENT_EXTENSIONS" ]]; then
L2_AGENT_EXTENSIONS=$l2_agent_extension
elif [[ ! ,${L2_AGENT_EXTENSIONS}, =~ ,${l2_agent_extension}, ]]; then
L2_AGENT_EXTENSIONS+=",$l2_agent_extension"
fi
}
function configure_l2_agent {
iniset /$NEUTRON_CORE_PLUGIN_CONF agent extensions "$L2_AGENT_EXTENSIONS"
}

10
devstack/lib/l3_agent
View File

@ -1,13 +1,3 @@
function plugin_agent_add_l3_agent_extension {
local l3_agent_extension=$1
if [[ -z "$L3_AGENT_EXTENSIONS" ]]; then
L3_AGENT_EXTENSIONS=$l3_agent_extension
elif [[ ! ,${L3_AGENT_EXTENSIONS}, =~ ,${l3_agent_extension}, ]]; then
L3_AGENT_EXTENSIONS+=",$l3_agent_extension"
fi
}
function configure_l3_agent {
iniset $NEUTRON_L3_CONF agent extensions "$L3_AGENT_EXTENSIONS"
}

5
devstack/lib/ml2
View File

@ -1,8 +1,3 @@
function configure_qos_ml2 {
neutron_ml2_extension_driver_add "qos"
}
function configure_ml2_extension_drivers {
if is_neutron_legacy_enabled; then
# NOTE(yamamoto): This overwrites what neutron-legacy set,

28
devstack/lib/qos
View File

@ -1,28 +0,0 @@
function configure_qos_service_plugin {
neutron_service_plugin_class_add "qos"
}
function configure_qos_core_plugin {
configure_qos_$NEUTRON_CORE_PLUGIN
}
function configure_qos_l2_agent {
plugin_agent_add_l2_agent_extension "qos"
}
function configure_qos {
configure_qos_service_plugin
configure_qos_core_plugin
configure_qos_l2_agent
}
function configure_l3_agent_extension_fip_qos {
plugin_agent_add_l3_agent_extension "fip_qos"
}
function configure_l3_agent_extension_gateway_ip_qos {
plugin_agent_add_l3_agent_extension "gateway_ip_qos"
}

8
devstack/plugin.sh
View File

@ -9,7 +9,6 @@ source $LIBDIR/l3_agent
source $LIBDIR/l3_conntrack_helper
source $LIBDIR/ml2
source $LIBDIR/network_segment_range
source $LIBDIR/qos
source $LIBDIR/segments
source $LIBDIR/log
source $LIBDIR/fip_port_forwarding
@ -53,9 +52,6 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled q-flavors neutron-flavors; then
configure_flavors
fi
if is_service_enabled q-qos neutron-qos; then
configure_qos
fi
if is_service_enabled q-log neutron-log; then
configure_log
fi
@ -90,10 +86,6 @@ if [[ "$1" == "stack" ]]; then
configure_l2_agent_sriovnicswitch
fi
if is_service_enabled q-l3 neutron-l3; then
if is_service_enabled q-qos neutron-qos; then
configure_l3_agent_extension_fip_qos
configure_l3_agent_extension_gateway_ip_qos
fi
if is_service_enabled q-port-forwarding neutron-port-forwarding; then
configure_port_forwarding
fi