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

3 files changed, 37 insertions, 0 deletions

diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2
new file mode 100644
index 000000000..05c6a928b
--- /dev/null
+++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2
@@ -0,0 +1,9 @@
+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/openvswitch/ovs-db-server/config-external.sh b/docker/openvswitch/ovs-db-server/config-external.sh
new file mode 100644
index 000000000..9ada4efcb
--- /dev/null
+++ b/docker/openvswitch/ovs-db-server/config-external.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh
new file mode 100755
index 000000000..89b2e3e92
--- /dev/null
+++ b/docker/openvswitch/ovs-db-server/start.sh
@@ -0,0 +1,25 @@
+#!/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