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

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: Ie09a6e3d04af792539bdabe1310de6bad3ecccee
Partially-Implements: blueprint install-from-ubuntu
---
 docker_templates/magnum/magnum-api/build          |  1 -
 docker_templates/magnum/magnum-base/Dockerfile.j2 | 13 +++++--------
 docker_templates/magnum/magnum-base/build         |  1 -
 docker_templates/magnum/magnum-conductor/build    |  1 -
 4 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 120000 docker_templates/magnum/magnum-api/build
 delete mode 120000 docker_templates/magnum/magnum-base/build
 delete mode 120000 docker_templates/magnum/magnum-conductor/build

diff --git a/docker_templates/magnum/magnum-api/build b/docker_templates/magnum/magnum-api/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/magnum/magnum-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-base/Dockerfile.j2 b/docker_templates/magnum/magnum-base/Dockerfile.j2
index b955329f03..59c22f57e9 100644
--- a/docker_templates/magnum/magnum-base/Dockerfile.j2
+++ b/docker_templates/magnum/magnum-base/Dockerfile.j2
@@ -18,15 +18,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     {% endif %}
 {% elif install_type == 'source' %}
 
-ADD ./magnum.tar /
-RUN ln -s /magnum-* /magnum
-
-RUN cd /magnum \
+ADD magnum.tar /
+RUN ln -s /magnum-* magnum \
     && useradd --user-group magnum \
-    && pip install -r requirements.txt \
-    && pip install /magnum \
-    && mkdir /etc/magnum /var/log/magnum \
+    && pip --no-cache-dir install /magnum \
+    && mkdir -p /etc/magnum /var/log/magnum /home/magnum \
     && cp -r /magnum/etc/* /etc/magnum/ \
-    && rm -rf /root/.cache
+    && chown -R magnum: /etc/magnum /var/log/magnum /home/magnum
 
 {% endif %}
diff --git a/docker_templates/magnum/magnum-base/build b/docker_templates/magnum/magnum-base/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-conductor/build b/docker_templates/magnum/magnum-conductor/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/magnum/magnum-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file