From 13fe758998d0b89a746ff6e8e89825522ee3780d Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 27 Aug 2015 10:32:49 +0000 Subject: [PATCH] Unify Centos and Ubuntu Source Install - Horizon 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: I5a053588a7f2817212e49158d40450754e67d257 Partially-Implements: blueprint install-from-ubuntu --- docker_templates/horizon/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2 index e02cbe6f6b..d05b21c158 100644 --- a/docker_templates/horizon/Dockerfile.j2 +++ b/docker_templates/horizon/Dockerfile.j2 @@ -39,10 +39,10 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} ADD horizon.tar / -RUN ln -s /horizon-* /horizon \ +RUN ln -s /horizon-* horizon \ && pip --no-cache-dir install /horizon \ && useradd --user-group horizon \ - && mkdir /etc/openstack-dashboard /home/horizon \ + && mkdir -p /etc/openstack-dashboard /home/horizon \ && ln -s openstack_dashboard/static/ /usr/lib/python2.7/site-packages/static \ && ln -s /etc/openstack-dashboard/local_settings /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \