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

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: I6b66fad8c06416f6b9f17348301dcb1e91fe50cd
Partially-Implements: blueprint install-from-ubuntu
---
 docker_templates/zaqar/Dockerfile.j2 | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/docker_templates/zaqar/Dockerfile.j2 b/docker_templates/zaqar/Dockerfile.j2
index ee312dd567..fd4752f78b 100644
--- a/docker_templates/zaqar/Dockerfile.j2
+++ b/docker_templates/zaqar/Dockerfile.j2
@@ -14,21 +14,17 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     {% endif %}
 {% elif install_type == 'source' %}
 
-ADD ./zaqar.tar /
-RUN ln -s /zaqar-* /zaqar
-
-RUN cd /zaqar \
+ADD zaqar.tar /
+RUN ln -s /zaqar-* zaqar \
     && useradd --user-group zaqar \
-    && pip install -r requirements.txt \
-    && pip install /zaqar \
-    && mkdir /etc/zaqar /var/log/zaqar \
+    && pip --no-cache-dir install /zaqar \
+    && mkdir -p /etc/zaqar /var/log/zaqar /home/zaqar \
     && cp -r /zaqar/etc/* /etc/zaqar/ \
-    && rm -rf /root/.cache
+    && chown -R zaqar: /etc/zaqar /var/log/zaqar /home/zaqar
 
 {% endif %}
 
-COPY ./start.sh /start.sh
-
+COPY start.sh /
 COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]