aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-23 13:40:57 +0000
committerGerrit Code Review <review@openstack.org>2015-07-23 13:40:57 +0000
commit63035f7ce428188a5c667ccf273a5f91e75f0ea5 (patch)
tree9f80a82c48eee4161731c478b7be09bfd39d70cc /docker/common
parent1c86345529f183a16c347c50516e6ded6c7a3606 (diff)
parent77f71b9f59d2900d1536a2a72a01779a61d8fd94 (diff)
downloadkolla-63035f7ce428188a5c667ccf273a5f91e75f0ea5.tar.gz
kolla-63035f7ce428188a5c667ccf273a5f91e75f0ea5.zip
Merge "Adds the appropriate tools to addin the ovs bridge"
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
new file mode 100755
index 000000000..c39d64ff7
--- /dev/null
+++ b/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+bridge=$1
+port=$2
+
+ovs-vsctl br-exists $bridge; rc=$?
+if [[ $rc == 2 ]]; then
+ changed=changed
+ ovs-vsctl add-br $bridge
+fi
+
+if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
+ changed=changed
+ ovs-vsctl add-port $bridge $port
+fi
+
+echo $changed