From 8594c78a0a1d78011893e78ea16be33f73b7f60b Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 10:29:59 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Gnocchi

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

diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
index 49cf68efb9..be88400735 100644
--- a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
@@ -14,16 +14,12 @@ RUN apt-get install -y --no-install-recommends libpq-dev \
 
     {% endif %}
 
-ADD ./gnocchi.tar /
-RUN ln -s /gnocchi-* /gnocchi
-
-RUN cd /gnocchi \
+ADD gnocchi.tar /
+RUN ln -s /gnocchi-* gnocchi \
     && useradd --user-group gnocchi \
-    && pip install -r requirements.txt \
-    && pip install --install-option="--install-scripts=/usr/bin" /gnocchi \
+    && pip --no-cache-dir install /gnocchi \
     && mkdir -p /etc/gnocchi /var/log/gnocchi /home/gnocchi \
     && cp -r /gnocchi/etc/* /etc/gnocchi/ \
-    && chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi \
-    && rm -rf /root/.cache
+    && chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi
 
 {% endif %}