Merge "Update octavia plugin code"
This commit is contained in:
commit
c4846162b6
@ -4,7 +4,6 @@
|
|||||||
XTRACE=$(set +o | grep xtrace)
|
XTRACE=$(set +o | grep xtrace)
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
if is_plugin_enabled octavia; then
|
|
||||||
function octavia_create_network_interface_device {
|
function octavia_create_network_interface_device {
|
||||||
INTERFACE=$1
|
INTERFACE=$1
|
||||||
MGMT_PORT_ID=$2
|
MGMT_PORT_ID=$2
|
||||||
@ -29,6 +28,7 @@ if is_plugin_enabled octavia; then
|
|||||||
}
|
}
|
||||||
|
|
||||||
function octavia_delete_network_interface_device {
|
function octavia_delete_network_interface_device {
|
||||||
|
|
||||||
if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then
|
if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then
|
||||||
: # Do nothing
|
: # Do nothing
|
||||||
elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then
|
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"
|
die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
fi
|
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$XTRACE
|
$XTRACE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user