aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-21 17:46:17 +0000
committerGerrit Code Review <review@openstack.org>2015-08-21 17:46:18 +0000
commit76630d26a5a50e4177fff93b529d4864a46ef058 (patch)
treebaf139149fbc8ef9ce8669a8fc337cd3ab431882
parent0f2a4e1e0bcbc6ce513901dbd2b90a1922630556 (diff)
parent37283874d07ffb19bc1717faf85fa80c0c230f39 (diff)
downloadkolla-76630d26a5a50e4177fff93b529d4864a46ef058.tar.gz
kolla-76630d26a5a50e4177fff93b529d4864a46ef058.zip
Merge "Added missing configuration to horizon docker template."
-rw-r--r--docker_templates/horizon/Dockerfile.j212
1 files changed, 11 insertions, 1 deletions
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2
index d1ee8592e..dfd731939 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