aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-27 10:32:49 +0000
committerSam Yaple <sam@yaple.net>2015-08-27 11:14:11 +0000
commit13fe758998d0b89a746ff6e8e89825522ee3780d (patch)
tree456787927dff80ec8df91b7deabf6fccba5c1aa8
parenteecf6581a47745d53298c4efa5af6c411afa6260 (diff)
downloadkolla-13fe758998d0b89a746ff6e8e89825522ee3780d.tar.gz
kolla-13fe758998d0b89a746ff6e8e89825522ee3780d.zip
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
-rw-r--r--docker_templates/horizon/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2
index e02cbe6f6..d05b21c15 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/ \