From b2c64529ed51c910f57636886b24dce25246cd88 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 18:21:24 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Neutron

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: I5c61a31b0a6d8892350311b4afe8f31c28eb2f7f
Implements: blueprint install-from-ubuntu
---
 docker_templates/neutron/neutron-base/Dockerfile.j2 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2
index 367d5daaea..3e10aff270 100644
--- a/docker_templates/neutron/neutron-base/Dockerfile.j2
+++ b/docker_templates/neutron/neutron-base/Dockerfile.j2
@@ -31,20 +31,16 @@ RUN apt-get install -y --no-install-recommends \
 
     {% endif %}
 
-ADD ./neutron.tar /
-RUN ln -s /neutron-* /neutron
-
-RUN cd /neutron \
+ADD neutron.tar /
+RUN ln -s /neutron-* neutron \
     && useradd --user-group neutron \
-    && pip install -r requirements.txt \
-    && pip install --install-option="--install-scripts=/usr/bin" /neutron \
+    && pip --no-cache-dir install /neutron \
     && mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \
     && cp -r etc/* /etc/neutron/ \
     && cp -r etc/neutron/* /etc/neutron/ \
     && cp etc/api-paste.ini /usr/share/neutron \
     && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
-    && chown -R neutron: /etc/neutron /var/log/neutron /home/neutron \
-    && rm -rf /root/.cache
+    && chown -R neutron: /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron
 
 {% endif %}