diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 13:29:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 13:29:01 +0000 |
| commit | dab1382909c512564352c78defce00667c86fc2b (patch) | |
| tree | ff5213c13987586785db0f8e533649e7fe4081e9 /docker/openvswitch/ovs-vswitchd | |
| parent | e69571eeb3729907be2ea6acb80904c4790a6916 (diff) | |
| parent | 76920be5fad2bb58680fd21681713b236bea7edf (diff) | |
| download | kolla-dab1382909c512564352c78defce00667c86fc2b.tar.gz kolla-dab1382909c512564352c78defce00667c86fc2b.zip | |
Merge "Rename ovs to openvswitch"
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 |
