From 2e4ab0287352a623e275fe703ed76305e1fbfd82 Mon Sep 17 00:00:00 2001 From: Erik Panter Date: Thu, 15 Dec 2022 13:59:56 +0100 Subject: 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) --- docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docker') 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 -- cgit v1.2.3