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

19 files changed, 0 insertions, 298 deletions

diff --git a/docker_templates/designate/designate-api/Dockerfile.j2 b/docker_templates/designate/designate-api/Dockerfile.j2
deleted file mode 100644
index 75f4b06ee..000000000
--- a/docker_templates/designate/designate-api/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum install -y \
-    openstack-designate-api \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-api/config-external.sh b/docker_templates/designate/designate-api/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-api/start.sh b/docker_templates/designate/designate-api/start.sh
deleted file mode 100755
index fe556225b..000000000
--- a/docker_templates/designate/designate-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-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 "designate-manage db_sync" designate
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-backend-bind9/Dockerfile.j2 b/docker_templates/designate/designate-backend-bind9/Dockerfile.j2
deleted file mode 100644
index 06f86c043..000000000
--- a/docker_templates/designate/designate-backend-bind9/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum install -y bind \
-    && yum clean all \
-    && cp -pr /var/named /opt/kolla/var-named
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-backend-bind9/config-external.sh b/docker_templates/designate/designate-backend-bind9/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-backend-bind9/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-backend-bind9/start.sh b/docker_templates/designate/designate-backend-bind9/start.sh
deleted file mode 100755
index 11922974a..000000000
--- a/docker_templates/designate/designate-backend-bind9/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/sbin/named"
-ARGS="-u named -g"
-
-# Execute config strategy
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-base/Dockerfile.j2 b/docker_templates/designate/designate-base/Dockerfile.j2
deleted file mode 100644
index 3fec3a6f7..000000000
--- a/docker_templates/designate/designate-base/Dockerfile.j2
+++ /dev/null
@@ -1,37 +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 ['centos', 'fedora', 'oraclelinux'] %}
-
-# Install designate-api because of /etc/designate/policy.json, which
-# is needed in all services. This is probably a packaging bug. We do
-# need the complete policy file because of some of the containers'
-# requiring it. Remove the package when the file is moved though.
-RUN yum install -y \
-    MySQL-python \
-    openstack-designate-api \
-    openstack-designate-common \
-    python-tooz \
-    && yum clean all \
-    && cp /etc/designate/policy.json /tmp/ \
-    && rpm -e openstack-designate-api \
-    && mv /tmp/policy.json /etc/designate/
-
-    {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-{% elif install_type == 'source' %}
-
-ADD designate.tar /
-RUN ln -s /designate-* designate \
-    && useradd --user-group designate \
-    && pip --no-cache-dir install /designate \
-    && mkdir -p /etc/designate /var/log/designate /home/designate \
-    && cp -r /designate/etc/designate/* /etc/designate/ \
-    && chown -R designate: /etc/designate /var/log/designate /home/designate
-
-{% endif %}
diff --git a/docker_templates/designate/designate-central/Dockerfile.j2 b/docker_templates/designate/designate-central/Dockerfile.j2
deleted file mode 100644
index 771ff3c68..000000000
--- a/docker_templates/designate/designate-central/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum install -y \
-    openstack-designate-central \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-central/config-external.sh b/docker_templates/designate/designate-central/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-central/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-central/start.sh b/docker_templates/designate/designate-central/start.sh
deleted file mode 100755
index eac012d3d..000000000
--- a/docker_templates/designate/designate-central/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-central"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-mdns/Dockerfile.j2 b/docker_templates/designate/designate-mdns/Dockerfile.j2
deleted file mode 100644
index cc5f5fb89..000000000
--- a/docker_templates/designate/designate-mdns/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum install -y openstack-designate-mdns \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-mdns/config-external.sh b/docker_templates/designate/designate-mdns/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-mdns/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker_templates/designate/designate-mdns/start.sh
deleted file mode 100755
index b4bcda20c..000000000
--- a/docker_templates/designate/designate-mdns/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-mdns"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-poolmanager/Dockerfile.j2 b/docker_templates/designate/designate-poolmanager/Dockerfile.j2
deleted file mode 100644
index 0fc968b90..000000000
--- a/docker_templates/designate/designate-poolmanager/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-# The bind9 package here is only to provide the rndc binary.
-RUN yum install -y \
-    openstack-designate-pool-manager \
-    bind \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-poolmanager/config-external.sh b/docker_templates/designate/designate-poolmanager/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-poolmanager/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker_templates/designate/designate-poolmanager/start.sh
deleted file mode 100755
index 0752b9847..000000000
--- a/docker_templates/designate/designate-poolmanager/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-pool-manager"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-sink/Dockerfile.j2 b/docker_templates/designate/designate-sink/Dockerfile.j2
deleted file mode 100644
index c0ea23b2d..000000000
--- a/docker_templates/designate/designate-sink/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum install -y \
-    openstack-designate-sink \
-    python-designateclient \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/designate/designate-sink/config-external.sh b/docker_templates/designate/designate-sink/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker_templates/designate/designate-sink/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/designate/designate-sink/start.sh b/docker_templates/designate/designate-sink/start.sh
deleted file mode 100755
index d2f93e26f..000000000
--- a/docker_templates/designate/designate-sink/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-sink"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS