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

4 files changed, 0 insertions, 69 deletions

diff --git a/docker_templates/haproxy/Dockerfile.j2 b/docker_templates/haproxy/Dockerfile.j2
deleted file mode 100755
index 2858f436a..000000000
--- a/docker_templates/haproxy/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install \
-        haproxy \
-    && yum clean all
-
-{% elif base_distro == 'ubuntu' %}
-
-RUN apt-get install -y --no-install-recommends -t trusty-backports haproxy \
-    && apt-get clean
-
-{% elif base_distro == 'debian' %}
-
-RUN apt-get install -y --no-install-recommends haproxy \
-    && apt-get clean
-
-{% endif %}
-
-COPY start.sh /
-COPY config-external.sh ensure_latest_config.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/haproxy/config-external.sh b/docker_templates/haproxy/config-external.sh
deleted file mode 100644
index 0c41a5bdb..000000000
--- a/docker_templates/haproxy/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/haproxy/haproxy.cfg"
-TARGET="/etc/haproxy/haproxy.cfg"
-OWNER="root"
-
-if [[ -f "$SOURCE" ]]; then
-    cp -f $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/haproxy/ensure_latest_config.sh b/docker_templates/haproxy/ensure_latest_config.sh
deleted file mode 100755
index b91189ca5..000000000
--- a/docker_templates/haproxy/ensure_latest_config.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-CURRENT_CONFIG_HASH=$(sha1sum /etc/haproxy/haproxy.cfg | cut -f1 -d' ')
-NEW_CONFIG_HASH=$(sha1sum /opt/kolla/haproxy/haproxy.cfg | cut -f1 -d' ')
-
-if [[ $CURRENT_CONFIG_HASH != $NEW_CONFIG_HASH ]]; then
-    changed=changed
-    source /opt/kolla/config-external.sh
-    /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $(cat /run/haproxy.pid)
-fi
-
-echo $changed
diff --git a/docker_templates/haproxy/start.sh b/docker_templates/haproxy/start.sh
deleted file mode 100755
index d1da4a607..000000000
--- a/docker_templates/haproxy/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD='/usr/sbin/haproxy'
-ARGS="-f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# We are intentionally not using exec so we can reload the haproxy config later
-$CMD $ARGS
-
-# TODO(SamYaple): This has the potential for a race condition triggered by a
-#                 config reload that could cause the container to exit
-while [[ -e "/proc/$(cat /run/haproxy.pid)" ]]; do
-    sleep 5
-done