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 --- .../openvswitch/ovs-base/Dockerfile.j2 | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 docker_templates/openvswitch/ovs-base/Dockerfile.j2 (limited to 'docker_templates/openvswitch/ovs-base') diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 deleted file mode 100644 index fd8eac1af..000000000 --- a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} - {% if install_type == 'source' %} - - # TODO(sdake): groan openvswitch is only in the RDO repos -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - && yum clean all - - {% endif %} - -RUN yum install -y \ - openvswitch \ - && yum clean all - -{% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends openvswitch-switch \ - && apt-get clean - -{% endif %} -- cgit v1.2.3