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-base/Dockerfile.j2       | 15 +++++++++++++++
 docker/openvswitch/openvswitch-db-server/Dockerfile.j2  |  8 ++++++++
 docker/openvswitch/openvswitch-db-server/start.sh       | 12 ++++++++++++
 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2   |  9 +++++++++
 .../openvswitch-vswitchd/ovs_ensure_configured.sh       | 17 +++++++++++++++++
 docker/openvswitch/openvswitch-vswitchd/start.sh        |  9 +++++++++
 docker/openvswitch/ovs-base/Dockerfile.j2               | 15 ---------------
 docker/openvswitch/ovs-db-server/Dockerfile.j2          |  8 --------
 docker/openvswitch/ovs-db-server/start.sh               | 12 ------------
 docker/openvswitch/ovs-vswitchd/Dockerfile.j2           |  9 ---------
 .../openvswitch/ovs-vswitchd/ovs_ensure_configured.sh   | 17 -----------------
 docker/openvswitch/ovs-vswitchd/start.sh                |  9 ---------
 12 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 docker/openvswitch/openvswitch-base/Dockerfile.j2
 create mode 100644 docker/openvswitch/openvswitch-db-server/Dockerfile.j2
 create mode 100755 docker/openvswitch/openvswitch-db-server/start.sh
 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
 delete mode 100644 docker/openvswitch/ovs-base/Dockerfile.j2
 delete mode 100644 docker/openvswitch/ovs-db-server/Dockerfile.j2
 delete mode 100755 docker/openvswitch/ovs-db-server/start.sh
 delete mode 100644 docker/openvswitch/ovs-vswitchd/Dockerfile.j2
 delete mode 100755 docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
 delete mode 100755 docker/openvswitch/ovs-vswitchd/start.sh

(limited to 'docker')

diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
new file mode 100644
index 000000000..7ededdfcd
--- /dev/null
+++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum install -y \
+        openvswitch \
+    && yum clean all
+
+{% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends openvswitch-switch \
+    && apt-get clean
+
+{% endif %}
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
new file mode 100644
index 000000000..023bba83b
--- /dev/null
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -0,0 +1,8 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-db-server/start.sh b/docker/openvswitch/openvswitch-db-server/start.sh
new file mode 100755
index 000000000..60347b2dc
--- /dev/null
+++ b/docker/openvswitch/openvswitch-db-server/start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -o errexit
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+mkdir -p "/run/openvswitch"
+if [[ ! -e "/etc/openvswitch/conf.db" ]]; then
+    ovsdb-tool create "/etc/openvswitch/conf.db"
+fi
+
+exec $CMD
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
diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2
deleted file mode 100644
index 7ededdfcd..000000000
--- a/docker/openvswitch/ovs-base/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum install -y \
-        openvswitch \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends openvswitch-switch \
-    && apt-get clean
-
-{% endif %}
diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2
deleted file mode 100644
index cca030e35..000000000
--- a/docker/openvswitch/ovs-db-server/Dockerfile.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh
deleted file mode 100755
index 60347b2dc..000000000
--- a/docker/openvswitch/ovs-db-server/start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-mkdir -p "/run/openvswitch"
-if [[ ! -e "/etc/openvswitch/conf.db" ]]; then
-    ovsdb-tool create "/etc/openvswitch/conf.db"
-fi
-
-exec $CMD
diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
deleted file mode 100644
index 839da1f21..000000000
--- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovs-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/ovs-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
deleted file mode 100755
index c39d64ff7..000000000
--- a/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/ovs-vswitchd/start.sh b/docker/openvswitch/ovs-vswitchd/start.sh
deleted file mode 100755
index b72ba5a2e..000000000
--- a/docker/openvswitch/ovs-vswitchd/start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-modprobe openvswitch
-
-exec $CMD
-- 
cgit v1.2.3