aboutsummaryrefslogtreecommitdiff
path: root/docker_templates/nova/nova-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-24 18:42:05 +0000
committerGerrit Code Review <review@openstack.org>2015-08-24 18:42:05 +0000
commit7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d (patch)
tree562514aed0715ad5710cfb0663dc58ea9d4cea2e /docker_templates/nova/nova-base
parentf248eafdfda544ed2c9d6a6bcf9a54a53de33c5e (diff)
parenta070839b1f61e1cdd7bbcb0b943cd1683f19f093 (diff)
downloadkolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.tar.gz
kolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.zip
Merge "Ubuntu - Nova"
Diffstat (limited to 'docker_templates/nova/nova-base')
-rw-r--r--docker_templates/nova/nova-base/Dockerfile.j222
1 files changed, 12 insertions, 10 deletions
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2
index 46ce0e2e0..8e117e69e 100644
--- a/docker_templates/nova/nova-base/Dockerfile.j2
+++ b/docker_templates/nova/nova-base/Dockerfile.j2
@@ -27,26 +27,28 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
+RUN apt-get install -y --no-install-recommends \
+ iptables \
+ ebtables \
+ dnsmasq \
+ bridge-utils \
+ python-libvirt \
+ openssh-client \
+ openvswitch-switch \
+ && apt-get clean
{% endif %}
-RUN pip install \
- python-cinderclient \
- python-keystoneclient
-
ADD ./nova.tar /
RUN ln -s /nova-* /nova
RUN cd /nova \
&& useradd --user-group nova \
&& pip install -r requirements.txt \
- && pip install /nova \
- && tox -egenconfig \
- && mkdir /etc/nova /var/log/nova \
+ && pip install --install-option="--install-scripts=/usr/bin" /nova \
+ && mkdir /etc/nova /var/log/nova /home/nova \
&& cp -r /nova/etc/nova/* /etc/nova/ \
- && chown -R nova: /etc/nova /var/log/nova \
+ && chown -R nova: /etc/nova /var/log/nova /home/nova \
&& rm -rf /root/.cache
{% endif %}