diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-28 12:16:53 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-28 13:33:50 +0000 |
| commit | cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 (patch) | |
| tree | 2e4256b6b7b8339da11b1d17250378596e61605b /docker_templates/openvswitch/ovs-vswitchd | |
| parent | 3b5380ade021c9884551f427441cbfc0122eb0f0 (diff) | |
| download | kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.tar.gz kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.zip | |
Move docker_templates to docker dir
Updated build.py to reflect this change.
Deprecate --template option and make it a noop.
Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker_templates/openvswitch/ovs-vswitchd')
4 files changed, 0 insertions, 48 deletions
diff --git a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 deleted file mode 100644 index 59079d335..000000000 --- a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ /dev/null @@ -1,9 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ - -CMD ["/start.sh"] - -{{ include_footer }} diff --git a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh deleted file mode 100644 index 9ada4efcb..000000000 --- a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -#This file should be a noop. It just needs to exist, but it don't perform any function diff --git a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh deleted file mode 100755 index c39d64ff7..000000000 --- a/docker_templates/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_templates/openvswitch/ovs-vswitchd/start.sh b/docker_templates/openvswitch/ovs-vswitchd/start.sh deleted file mode 100755 index 3ec2c26b2..000000000 --- a/docker_templates/openvswitch/ovs-vswitchd/start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log" -DB_FILE="/etc/openvswitch/conf.db" -UNIXSOCK_DIR="/var/run/openvswitch" -UNIXSOCK="${UNIXSOCK_DIR}/db.sock" - -CMD="/usr/sbin/ovs-vswitchd" -ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file=${LOG_FILE}" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -modprobe openvswitch -mkdir -p "${UNIXSOCK_DIR}" - -exec $CMD $ARGS |
