From bd98a508bdea32411ac9685bd26d8642154cebd5 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 09:46:42 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Nova
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.
Change-Id: I58708a4e7375f20622c944539a41336333d3bfcb
Partially-Implements: blueprint install-from-ubuntu
---
docker_templates/nova/nova-base/Dockerfile.j2 | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2
index 8e117e69e8..b46a446d46 100644
--- a/docker_templates/nova/nova-base/Dockerfile.j2
+++ b/docker_templates/nova/nova-base/Dockerfile.j2
@@ -39,16 +39,12 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
-ADD ./nova.tar /
-RUN ln -s /nova-* /nova
-
-RUN cd /nova \
+ADD nova.tar /
+RUN ln -s /nova-* nova \
&& useradd --user-group nova \
- && pip install -r requirements.txt \
- && pip install --install-option="--install-scripts=/usr/bin" /nova \
- && mkdir /etc/nova /var/log/nova /home/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 \
- && rm -rf /root/.cache
+ && chown -R nova: /etc/nova /var/log/nova /home/nova
{% endif %}