From 6d3c4ced5f4b263cee2f2e6e45292dd40e789187 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 23 Jun 2023 10:07:36 -0700 Subject: [PATCH] Disable spanning tree So, I've long wondered if we still have some spanning tree behavior going on in CI. Turns out we might, but we just rely upon the defaults which creates a variable. Anyway, regardless, I found some details in the ovs-vsctl manual[0], and well, lets set the options! [0]: http://www.openvswitch.org/support/dist-docs/ovs-vsctl.8.html Change-Id: I8f229fa6e738a69a668d4b891723431b2da362fa --- devstack/tools/ironic/scripts/setup-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/tools/ironic/scripts/setup-network.sh b/devstack/tools/ironic/scripts/setup-network.sh index ee64520052..26c1c275b0 100755 --- a/devstack/tools/ironic/scripts/setup-network.sh +++ b/devstack/tools/ironic/scripts/setup-network.sh @@ -20,7 +20,7 @@ PUBLIC_BRIDGE_MTU=${2:-1500} export VIRSH_DEFAULT_CONNECT_URI="$LIBVIRT_CONNECT_URI" # Only add bridge if missing. Bring it UP. -(sudo ovs-vsctl list-br | grep ${BRIDGE_NAME}) || sudo ovs-vsctl add-br ${BRIDGE_NAME} +(sudo ovs-vsctl list-br | grep ${BRIDGE_NAME}) || sudo ovs-vsctl add-br ${BRIDGE_NAME} && ovs-vsctl set Bridge ${BRIDGE_NAME} stp_enable=False && ovs-vsctl set Bridge ${BRIDGE_NAME} rstp_enable=false sudo ip link set dev ${BRIDGE_NAME} up # Remove bridge before replacing it.