aboutsummaryrefslogtreecommitdiff
path: root/docker_templates/nova/nova-base
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-28 12:16:53 +0000
committerSam Yaple <sam@yaple.net>2015-08-28 13:33:50 +0000
commitcbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 (patch)
tree2e4256b6b7b8339da11b1d17250378596e61605b /docker_templates/nova/nova-base
parent3b5380ade021c9884551f427441cbfc0122eb0f0 (diff)
downloadkolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.tar.gz
kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.zip
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
Diffstat (limited to 'docker_templates/nova/nova-base')
-rw-r--r--docker_templates/nova/nova-base/Dockerfile.j250
1 files changed, 0 insertions, 50 deletions
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2
deleted file mode 100644
index b46a446d4..000000000
--- a/docker_templates/nova/nova-base/Dockerfile.j2
+++ /dev/null
@@ -1,50 +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 ['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 %}