diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-11 05:02:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-11 05:02:41 +0000 |
| commit | c4846162b6f7df3a69a214147976640717ad5270 (patch) | |
| tree | 361bc3139b2dc2e5cf2d5f89c387bc0ea6043081 /devstack/lib | |
| parent | 6c2c0627d1c3798e7e2f50239beb13fb749cea0a (diff) | |
| parent | 2500ca0b22476aa4e954ea87aa22ca9443ed2be8 (diff) | |
| download | neutron-c4846162b6f7df3a69a214147976640717ad5270.tar.gz | |
Merge "Update octavia plugin code"
Diffstat (limited to 'devstack/lib')
| -rw-r--r-- | devstack/lib/octavia | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/devstack/lib/octavia b/devstack/lib/octavia index 60326898c7..3f48b464db 100644 --- a/devstack/lib/octavia +++ b/devstack/lib/octavia @@ -4,42 +4,41 @@ 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 - MGMT_PORT_MAC=$3 +function octavia_create_network_interface_device { + INTERFACE=$1 + MGMT_PORT_ID=$2 + MGMT_PORT_MAC=$3 - if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then - if [[ $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then - openstack subnet set --gateway none lb-mgmt-subnet - fi - sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} $INTERFACE -- set Interface $INTERFACE type=internal -- set Interface $INTERFACE external-ids:iface-status=active -- set Interface $INTERFACE external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface $INTERFACE external-ids:iface-id=$MGMT_PORT_ID -- set Interface $INTERFACE external-ids:skip_cleanup=true - elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then - if ! ip link show $INTERFACE ; then - sudo ip link add $INTERFACE type veth peer name o-bhm0 - NETID=$(openstack network show lb-mgmt-net -c id -f value) - BRNAME=brq$(echo $NETID|cut -c 1-11) - sudo ip link set o-bhm0 master $BRNAME - sudo ip link set o-bhm0 up - fi - else - die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT" + if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then + if [[ $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then + openstack subnet set --gateway none lb-mgmt-subnet fi - } + sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} $INTERFACE -- set Interface $INTERFACE type=internal -- set Interface $INTERFACE external-ids:iface-status=active -- set Interface $INTERFACE external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface $INTERFACE external-ids:iface-id=$MGMT_PORT_ID -- set Interface $INTERFACE external-ids:skip_cleanup=true + elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then + if ! ip link show $INTERFACE ; then + sudo ip link add $INTERFACE type veth peer name o-bhm0 + NETID=$(openstack network show lb-mgmt-net -c id -f value) + BRNAME=brq$(echo $NETID|cut -c 1-11) + sudo ip link set o-bhm0 master $BRNAME + sudo ip link set o-bhm0 up + fi + else + die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT" + fi +} + +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 - : # Do nothing - elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then - if ip link show $INTERFACE ; then - sudo ip link del $INTERFACE - fi - else - die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT" + if [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" || $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then + : # Do nothing + elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then + if ip link show $INTERFACE ; then + sudo ip link del $INTERFACE fi - } -fi + else + die "Unknown network controller - $NEUTRON_AGENT/$Q_AGENT" + fi +} # Restore xtrace $XTRACE |