openstack/octavia
Code Issues Proposed changes

Merge "Remove Neutron SDN-specific code"

Browse Source
This commit is contained in:
Zuul
2021-03-10 11:07:11 +00:00
committed by Gerrit Code Review
parent 41ff3ee3f1 dcdf6315b3
commit 651f095a81
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@@ -462,16 +462,6 @@ function create_mgmt_network_interface {
if function_exists octavia_create_network_interface_device ; then if function_exists octavia_create_network_interface_device ; then
octavia_create_network_interface_device o-hm0 $MGMT_PORT_ID $MGMT_PORT_MAC octavia_create_network_interface_device o-hm0 $MGMT_PORT_ID $MGMT_PORT_MAC
elif [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" ]]; then
sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} o-hm0 -- set Interface o-hm0 type=internal -- set Interface o-hm0 external-ids:iface-status=active -- set Interface o-hm0 external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface o-hm0 external-ids:iface-id=$MGMT_PORT_ID -- set Interface o-hm0 external-ids:skip_cleanup=true
elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then
if ! ip link show o-hm0 ; then
sudo ip link add o-hm0 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 brctl addif $BRNAME o-bhm0
sudo ip link set o-bhm0 up
fi
else else
die "Unknown network controller. Please define octavia_create_network_interface_device" die "Unknown network controller. Please define octavia_create_network_interface_device"
fi fi
@@ -651,8 +641,10 @@ function octavia_stop {
if function_exists octavia_delete_network_interface_device ; then if function_exists octavia_delete_network_interface_device ; then
octavia_delete_network_interface_device o-hm0 octavia_delete_network_interface_device o-hm0
elif [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" ]]; then elif [[ $NEUTRON_AGENT == "openvswitch" || $Q_AGENT == "openvswitch" ]]; then
# This elif can go away in the X cycle, needed for grenade old/new logic
: # Do nothing : # Do nothing
elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then elif [[ $NEUTRON_AGENT == "linuxbridge" || $Q_AGENT == "linuxbridge" ]]; then
# This elif can go away in the X cycle, needed for grenade old/new logic
if ip link show o-hm0 ; then if ip link show o-hm0 ; then
sudo ip link del o-hm0 sudo ip link del o-hm0
fi fi

1
zuul.d/jobs.yaml
View File

@@ -49,6 +49,7 @@
check_interval: 1 check_interval: 1
check_timeout: 180 check_timeout: 180
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git
octavia: https://opendev.org/openstack/octavia.git octavia: https://opendev.org/openstack/octavia.git
octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git
devstack_services: devstack_services: