From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 28 Aug 2015 12:16:53 +0000
Subject: 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
---
 docker_templates/haproxy/Dockerfile.j2 | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100755 docker_templates/haproxy/Dockerfile.j2

(limited to 'docker_templates/haproxy/Dockerfile.j2')

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 }}
-- 
cgit v1.2.3