openstack/neutron
Code Issues Proposed changes

Merge "Update octavia plugin code"

Browse Source
This commit is contained in:
Zuul 2020-12-11 05:02:41 +00:00 committed by Gerrit Code Review
commit c4846162b6
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/octavia
View File

@ -4,7 +4,6 @@
XTRACE=$(set +o | grep xtrace)
set +o xtrace
if is_plugin_enabled octavia; then
function octavia_create_network_interface_device {
INTERFACE=$1
MGMT_PORT_ID=$2
@ -29,6 +28,7 @@ if is_plugin_enabled octavia; then
}
function octavia_delete_network_interface_device {
if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then
: # Do nothing
elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then
@ -39,7 +39,6 @@ if is_plugin_enabled octavia; then
die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT"
fi
}
fi
# Restore xtrace
$XTRACE