From 76920be5fad2bb58680fd21681713b236bea7edf Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Mon, 28 Sep 2015 11:10:17 +0000
Subject: Rename ovs to openvswitch

Our openvswitch image does not follow the naming convention of any of
our other containers and it should.

Change-Id: If1b815117bb39df74061218e48778479b8d674bc
Closes-Bug: #1500392
---
 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2   |  9 +++++++++
 .../openvswitch-vswitchd/ovs_ensure_configured.sh       | 17 +++++++++++++++++
 docker/openvswitch/openvswitch-vswitchd/start.sh        |  9 +++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
 create mode 100755 docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
 create mode 100755 docker/openvswitch/openvswitch-vswitchd/start.sh

(limited to 'docker/openvswitch/openvswitch-vswitchd')

diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
new file mode 100644
index 000000000..8dbd6548a
--- /dev/null
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -0,0 +1,9 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY ovs_ensure_configured.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
new file mode 100755
index 000000000..c39d64ff7
--- /dev/null
+++ b/docker/openvswitch/openvswitch-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
diff --git a/docker/openvswitch/openvswitch-vswitchd/start.sh b/docker/openvswitch/openvswitch-vswitchd/start.sh
new file mode 100755
index 000000000..b72ba5a2e
--- /dev/null
+++ b/docker/openvswitch/openvswitch-vswitchd/start.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -o errexit
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+modprobe openvswitch
+
+exec $CMD
-- 
cgit v1.2.3