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

8 files changed, 0 insertions, 107 deletions

diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2
deleted file mode 100644
index fd8eac1af..000000000
--- a/docker_templates/openvswitch/ovs-base/Dockerfile.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-    {% if install_type == 'source' %}
-
-    # TODO(sdake): groan openvswitch is only in the RDO repos
-RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
-    && yum clean all
-
-    {% endif %}
-
-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_templates/openvswitch/ovs-db-server/Dockerfile.j2 b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2
deleted file mode 100644
index 05c6a928b..000000000
--- a/docker_templates/openvswitch/ovs-db-server/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 config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/openvswitch/ovs-db-server/config-external.sh b/docker_templates/openvswitch/ovs-db-server/config-external.sh
deleted file mode 100644
index 9ada4efcb..000000000
--- a/docker_templates/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_templates/openvswitch/ovs-db-server/start.sh b/docker_templates/openvswitch/ovs-db-server/start.sh
deleted file mode 100755
index 89b2e3e92..000000000
--- a/docker_templates/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_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