diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-28 11:10:17 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-28 11:10:17 +0000 |
| commit | 76920be5fad2bb58680fd21681713b236bea7edf (patch) | |
| tree | 39ff059f796f1151fa9e0275ba825c751de9a5d4 /docker/openvswitch/ovs-vswitchd | |
| parent | a0ac8764948f2dba28f648d053cd0a68d8c3e78d (diff) | |
| download | kolla-76920be5fad2bb58680fd21681713b236bea7edf.tar.gz kolla-76920be5fad2bb58680fd21681713b236bea7edf.zip | |
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
Diffstat (limited to 'docker/openvswitch/ovs-vswitchd')
| -rw-r--r-- | docker/openvswitch/ovs-vswitchd/Dockerfile.j2 | 9 | ||||
| -rwxr-xr-x | docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh | 17 | ||||
| -rwxr-xr-x | docker/openvswitch/ovs-vswitchd/start.sh | 9 |
3 files changed, 0 insertions, 35 deletions
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 |