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

7 files changed, 0 insertions, 99 deletions

diff --git a/docker_templates/glance/glance-api/Dockerfile.j2 b/docker_templates/glance/glance-api/Dockerfile.j2
deleted file mode 100644
index e603a6c36..000000000
--- a/docker_templates/glance/glance-api/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-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/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh
deleted file mode 100755
index ce5411738..000000000
--- a/docker_templates/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-api/glance-api.conf"
-TARGET="/etc/glance/glance-api.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh
deleted file mode 100755
index ce3cb6d8b..000000000
--- a/docker_templates/glance/glance-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/glance-api"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    su -s /bin/sh -c "glance-manage db_sync" glance
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker_templates/glance/glance-base/Dockerfile.j2
deleted file mode 100644
index 8fad82106..000000000
--- a/docker_templates/glance/glance-base/Dockerfile.j2
+++ /dev/null
@@ -1,28 +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-glance \
-        python-oslo-i18n \
-    && yum clean all
-
-    {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-{% elif install_type == 'source' %}
-
-ADD glance.tar /
-RUN ln -s /glance-* glance \
-    && useradd --user-group glance \
-    && pip --no-cache-dir install /glance \
-    && mkdir -p /etc/glance /var/log/glance /home/glance \
-    && cp -r /glance/etc/* /etc/glance/ \
-    && chown -R glance: /etc/glance /var/log/glance /home/glance
-
-{% endif %}
diff --git a/docker_templates/glance/glance-registry/Dockerfile.j2 b/docker_templates/glance/glance-registry/Dockerfile.j2
deleted file mode 100644
index e603a6c36..000000000
--- a/docker_templates/glance/glance-registry/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-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/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh
deleted file mode 100755
index 37abd136d..000000000
--- a/docker_templates/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-registry/glance-registry.conf"
-TARGET="/etc/glance/glance-registry.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh
deleted file mode 100755
index 1d8265f80..000000000
--- a/docker_templates/glance/glance-registry/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/glance-registry"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS