From 23697867d720460819ba4fcabcf6dd0238c1c8fe Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 22 Mar 2019 12:53:37 +0100 Subject: [PATCH] Move adding extra dashboard to the proper place Adding any dashboards shouldbe done before compiling and compressing as they can enable additional files that need to be compiled and compressed, so firs we should enabled them if needed and then compile+compress Change-Id: Ib2fb44f5829269aa974d467ea57d9add2b9e0141 --- horizon/templates/bin/_horizon.sh.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/horizon/templates/bin/_horizon.sh.tpl b/horizon/templates/bin/_horizon.sh.tpl index 3b42a2a03c..dec000f3e2 100644 --- a/horizon/templates/bin/_horizon.sh.tpl +++ b/horizon/templates/bin/_horizon.sh.tpl @@ -37,6 +37,12 @@ function start () { rm -rf /var/run/apache2/* APACHE_DIR="apache2" + # Add TaaS dashboard panel if available + TAAS_PANEL="${SITE_PACKAGES_ROOT}/neutron_taas_dashboard/enabled/_90_project_tapservices_panel.py" + if [ -f ${TAAS_PANEL} ]; then + ln -s ${TAAS_PANEL} ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/enabled/_90_project_tapservices_panel.py + fi + # If the image has support for it, compile the translations if type -p gettext >/dev/null 2>/dev/null; then cd ${SITE_PACKAGES_ROOT}/openstack_dashboard; /tmp/manage.py compilemessages @@ -47,12 +53,6 @@ function start () { /tmp/manage.py compress --force rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store - # Add TaaS dashboard panel if available - TAAS_PANEL="${SITE_PACKAGES_ROOT}/neutron_taas_dashboard/enabled/_90_project_tapservices_panel.py" - if [ -f ${TAAS_PANEL} ]; then - ln -s ${TAAS_PANEL} ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/enabled/_90_project_tapservices_panel.py - fi - exec apache2 -DFOREGROUND }