aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
index 99bae3e87..c91f87172 100644
--- a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
+++ b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
@@ -3,8 +3,14 @@
bridge=$1
port=$2
-ovs-vsctl br-exists $bridge; rc=$?
-if [[ $rc == 2 ]]; then
+ip link show $port
+if [[ $? -ne 0 ]]; then
+ # fail when device doesn't exist
+ exit 1
+fi
+
+ovs-vsctl br-exists $bridge
+if [[ $? -eq 2 ]]; then
changed=changed
ovs-vsctl --no-wait add-br $bridge
fi