From 82e9091c8dc676815239924890121801d54ea158 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 5 Nov 2016 21:09:44 +0800
Subject: [PATCH] Run collect static during container startup when necessarily

Other dashboard may need run collect static action when enabled.

TrivialFix

Change-Id: I60ffa29283f45850f11d75f2f8fd4ab9dd62484a
---
 docker/horizon/Dockerfile.j2   | 3 ---
 docker/horizon/extend_start.sh | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 3c9912cbef..cdaa8288c4 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -26,7 +26,6 @@ RUN useradd --user-group horizon \
     && chown -R apache: /usr/share/openstack-dashboard/static \
     && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
     && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
-    && /usr/bin/python /usr/bin/manage.py collectstatic --noinput --clear \
     && (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \
     && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages)
 {% endblock %}
@@ -51,7 +50,6 @@ RUN echo > /etc/apache2/ports.conf \
     && sed -i "s|WEBROOT='/horizon/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py \
     && sed -i "s|^POLICY_FILES_PATH|POLICY_FILES_PATH = '/etc/openstack-dashboard'|" /etc/openstack-dashboard/local_settings.py \
     && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
-    && /usr/bin/python /usr/bin/manage.py collectstatic --noinput \
     && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
     && rm /etc/openstack-dashboard/local_settings.py \
     && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
@@ -110,7 +108,6 @@ RUN ln -s horizon-source/* horizon \
            ln -s `find /plugins -name 'neutron-lbaas-dashboard-*' -type d`/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py \
                  /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py; \
        fi \
-    && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear \
     && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/horizon && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \
     && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \
     && chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/kolla/venv/lib/python2.7/site-packages/static
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 4db20fd8d5..b91afb98ec 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -29,8 +29,10 @@ if [[ ! -f ${MD5SUM_TXT_PATH} || $(md5sum -c --status ${MD5SUM_TXT_PATH};echo $?
     md5sum /etc/openstack-dashboard/local_settings > ${MD5SUM_TXT_PATH}
     if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then
         /usr/bin/manage.py compress --force
+        /usr/bin/manage.py collectstatic --noinput --clear
     elif [[ "${KOLLA_INSTALL_TYPE}" == "source" ]]; then
         /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force
+        /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear
     fi
 fi