diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 18:59:21 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | c685119fec2faa6caab6706aaea25d696493b476 (patch) | |
| tree | 8943ec2bd6b94f59d6b3c6651661a1805f7cb3d5 /docker | |
| parent | 9fe28bd22018bc140b5202786a3cecd6337ca973 (diff) | |
| download | kolla-c685119fec2faa6caab6706aaea25d696493b476.tar.gz kolla-c685119fec2faa6caab6706aaea25d696493b476.zip | |
Move scripts for openvswitch to docker_templates
Change-Id: I04e804bb36daf53ce2eb0db804008deb7ebc6b11
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
5 files changed, 0 insertions, 67 deletions
diff --git a/docker/common/openvswitch/ovs-db-server/config-external.sh b/docker/common/openvswitch/ovs-db-server/config-external.sh deleted file mode 100644 index 9ada4efcb..000000000 --- a/docker/common/openvswitch/ovs-db-server/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/common/openvswitch/ovs-db-server/start.sh b/docker/common/openvswitch/ovs-db-server/start.sh deleted file mode 100755 index 89b2e3e92..000000000 --- a/docker/common/openvswitch/ovs-db-server/start.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -o errexit - -LOG_FILE="/var/log/openvswitch/ovsdb-server.log" -DB_FILE="/etc/openvswitch/conf.db" -UNIXSOCK_DIR="/var/run/openvswitch" -UNIXSOCK="${UNIXSOCK_DIR}/db.sock" - -CMD="/usr/sbin/ovsdb-server" -ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK} --log-file=${LOG_FILE}" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -mkdir -p "${UNIXSOCK_DIR}" - -if [[ ! -e "${DB_FILE}" ]]; then - ovsdb-tool create "${DB_FILE}" -fi - -exec $CMD $ARGS diff --git a/docker/common/openvswitch/ovs-vswitchd/config-external.sh b/docker/common/openvswitch/ovs-vswitchd/config-external.sh deleted file mode 100644 index 9ada4efcb..000000000 --- a/docker/common/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/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh deleted file mode 100755 index c39d64ff7..000000000 --- a/docker/common/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/common/openvswitch/ovs-vswitchd/start.sh b/docker/common/openvswitch/ovs-vswitchd/start.sh deleted file mode 100755 index 3ec2c26b2..000000000 --- a/docker/common/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 |