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/nova/nova-base/Dockerfile.j2 | 50 +++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 docker/nova/nova-base/Dockerfile.j2

(limited to 'docker/nova/nova-base')

diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
new file mode 100644
index 000000000..b46a446d4
--- /dev/null
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -0,0 +1,50 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+        openstack-nova-common \
+        python-keystoneclient \
+        python-cinderclient \
+        python-nova \
+        bridge-utils \
+    && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+    {% endif %}
+{% elif install_type == 'source' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+        bridge-utils \
+    && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        iptables \
+        ebtables \
+        dnsmasq \
+        bridge-utils \
+        python-libvirt \
+        openssh-client \
+        openvswitch-switch \
+     && apt-get clean
+
+    {% endif %}
+
+ADD nova.tar /
+RUN ln -s /nova-* nova \
+    && useradd --user-group nova \
+    && pip --no-cache-dir install /nova \
+    && mkdir -p /etc/nova /var/log/nova /home/nova \
+    && cp -r /nova/etc/nova/* /etc/nova/ \
+    && chown -R nova: /etc/nova /var/log/nova /home/nova
+
+{% endif %}
-- 
cgit v1.2.3