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, 0 insertions, 49 deletions

diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2
deleted file mode 100644
index 1cce34a9e..000000000
--- a/docker_templates/cinder/cinder-base/Dockerfile.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type  }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install openstack-cinder \
-    python-automaton \
-    lvm2 \
-  && yum clean all \
-  && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-  && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
-
-     {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-  && /bin/false
-
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install lvm2 \
-   && yum clean all
-
-     {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends lvm2 \
-   && apt-get clean
-
-    {% endif %}
-
-ADD cinder.tar /
-RUN ln -s /cinder-* cinder \
-    && useradd --user-group cinder \
-    && pip --no-cache-dir install /cinder \
-    && mkdir -p /etc/cinder /var/log/cinder /home/cinder \
-    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
-    && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \
-    && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-    && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
-
-{% endif %}