diff options
| author | Erik Panter <e.panter@mittwald.de> | 2022-12-15 13:59:56 +0100 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2023-01-16 21:14:26 +0300 |
| commit | 2e4ab0287352a623e275fe703ed76305e1fbfd82 (patch) | |
| tree | 4e8a055eef1dc47736df6a8791b4ae0fee63438a /docker/openvswitch | |
| parent | b5b8d5198e2e8f68dc8f6c4947caede64149d202 (diff) | |
| download | kolla-2e4ab0287352a623e275fe703ed76305e1fbfd82.tar.gz kolla-2e4ab0287352a623e275fe703ed76305e1fbfd82.zip | |
relay non-zero exit codes when creating openvswitch bridges
Calls to `ovs-vsctl` in `ovs_ensure_configured.sh` did not get checked
for errors.
This can cause false success statuses when
the script is run by automation tools such as ansible.
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/870540
Closes-bug: #1999778
Change-Id: Iad83132b61efadbf09aa9aa2edf96235085764c6
(cherry picked from commit a840ac0d7c8777a8198ae40cbb79b65c5fffd7e1)
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh index c91f87172..6fada1031 100644 --- a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh +++ b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh @@ -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 |