Skip to content

Synchronise yoga with upstream #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2023
Merged

Synchronise yoga with upstream #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#!/bin/bash
set -o errexit

bridge=$1
port=$2

ip link show $port
if [[ $? -ne 0 ]]; then
if ! ip link show $port; then
# fail when device doesn't exist
exit 1
fi

ovs-vsctl br-exists $bridge
if [[ $? -eq 2 ]]; then
ovs-vsctl br-exists $bridge || if [[ $? -eq 2 ]]; then
changed=changed
ovs-vsctl --no-wait add-br $bridge
fi
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/bug-1999778.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
fixes:
- |
Fixes an issue where the script ``kolla_ensure_openvswitch_configured`` in
the ``openvswitch-db-server`` image would ignore errors encountered while
configuring bridges and ports.
`LP#1999778 <https://launchpad.net/bugs/1999778>`__