From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple 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 --- .../ceilometer/ceilometer-base/Dockerfile.j2 | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 (limited to 'docker_templates/ceilometer/ceilometer-base') diff --git a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 deleted file mode 100644 index 92a3b70d9..000000000 --- a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 +++ /dev/null @@ -1,21 +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 ['ubuntu', 'debian'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} -{% elif install_type == 'source' %} - -ADD ceilometer.tar / -RUN ln -s /ceilometer-* ceilometer \ - && useradd --user-group ceilometer \ - && pip --no-cache-dir install /ceilometer \ - && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \ - && cp -r /ceilometer/etc/* /etc/ceilometer/ \ - && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer - -{% endif %} -- cgit v1.2.3