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

1 files changed, 22 insertions, 0 deletions

diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2
new file mode 100644
index 000000000..fd8eac1af
--- /dev/null
+++ b/docker/openvswitch/ovs-base/Dockerfile.j2
@@ -0,0 +1,22 @@
+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 %}