From 94664283aa219eb8cab6a29d5001f758c3d9f40e Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 10:36:05 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Murano

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: I7b3504874088bae76c9dcb429c8aa8e0fd307a8e
Partially-Implements: blueprint install-from-ubuntu
---
 docker_templates/murano/murano-base/Dockerfile.j2 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker_templates/murano/murano-base/Dockerfile.j2
index bb762dd101..cb700e5e0c 100644
--- a/docker_templates/murano/murano-base/Dockerfile.j2
+++ b/docker_templates/murano/murano-base/Dockerfile.j2
@@ -9,15 +9,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD murano.tar /
-RUN ln -s /murano-* /murano
-
-RUN cd /murano \
+RUN ln -s /murano-* murano \
     && useradd --user-group murano \
-    && pip install -r requirements.txt \
-    && pip install --install-option="--install-scripts=/usr/bin" /murano \
+    && pip --no-cache-dir install /murano \
     && mkdir -p /etc/murano /var/log/murano /home/murano \
     && cp -r /murano/etc/murano/* /etc/murano/ \
-    && chown -R murano: /etc/murano /var/log/murano /home/murano \
-    && rm -rf /root/.cache
+    && chown -R murano: /etc/murano /var/log/murano /home/murano
 
 {% endif %}