From 37283874d07ffb19bc1717faf85fa80c0c230f39 Mon Sep 17 00:00:00 2001
From: Mick Thompson <michael.a.thompson@oracle.com>
Date: Thu, 20 Aug 2015 14:17:49 +0100
Subject: [PATCH] Added missing configuration to horizon docker template.
Added missing copy and link commands:
&& cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \
&& cp /horizon/openstack_dashboard/local/local_settings.py.example \
/etc/openstack-dashboard/local_settings \
&& ln -s /etc/openstack-dashboard/local_settings \
/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
&& cp /horizon/manage.py /usr/share/openstack-dashboard \
&& python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \
Changed 'mkdir -p /usr/share/openstack-dashboard/static' to 'mkdir -p /usr/share/openstack-dashboard'
Change-Id: Ia79c43d771ab2b3628112a9c4d0e6bb2d3348f4f
Closes-Bug: 1487028
---
docker_templates/horizon/Dockerfile.j2 | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2
index d1ee8592ee..dfd731939d 100644
--- a/docker_templates/horizon/Dockerfile.j2
+++ b/docker_templates/horizon/Dockerfile.j2
@@ -35,7 +35,17 @@ RUN cd /horizon \
&& useradd --user-group horizon \
&& pip install -r requirements.txt \
&& pip install /horizon \
- && mkdir -p /etc/openstack-dashboard /var/log/horizon /usr/share/openstack-dashboard/static \
+ && mkdir -p \
+ /etc/openstack-dashboard \
+ /var/log/horizon \
+ /usr/share/openstack-dashboard \
+ && cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \
+ && cp /horizon/openstack_dashboard/local/local_settings.py.example \
+ /etc/openstack-dashboard/local_settings \
+ && ln -s /etc/openstack-dashboard/local_settings \
+ /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
+ && cp /horizon/manage.py /usr/share/openstack-dashboard \
+ && python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \
&& chown -R apache:apache /usr/share/openstack-dashboard/static \
&& rm -rf /root/.cache