From 91b6216976a7890eb56d6780ee2264b2ad75bdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Albert?= Date: Thu, 26 Nov 2015 11:17:47 +0100 Subject: [PATCH] Fixed Horizon static file compression in devstack Static files needs to be compressed in Horizon. Since CloudKitty is loaded as a devstack plugin its files are copied after Horizon initialization. This patch add calls to django-admin to process new files. Change-Id: I51b703f682b74a35a1fb6cad64856093011ee2e2 --- devstack/plugin.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 5589c753..50b9144c 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -208,11 +208,28 @@ function install_cloudkitty_dashboard { setup_dev_lib "cloudkitty-dashboard" } +# update_horizon_static() - Update Horizon static files with CloudKitty's one +function update_horizon_static { + # Code taken from Horizon lib + # Setup alias for django-admin which could be different depending on distro + local django_admin + if type -p django-admin > /dev/null; then + django_admin=django-admin + else + django_admin=django-admin.py + fi + DJANGO_SETTINGS_MODULE=openstack_dashboard.settings \ + $django_admin collectstatic --noinput + DJANGO_SETTINGS_MODULE=openstack_dashboard.settings \ + $django_admin compress --force + restart_apache_server +} + # configure_cloudkitty_dashboard() - Set config files, create data dirs, etc function configure_cloudkitty_dashboard { sudo ln -s $CLOUDKITTY_ENABLED_DIR/_[0-9]*.py \ $CLOUDKITTY_HORIZON_ENABLED_DIR/ - restart_apache_server + update_horizon_static } if is_service_enabled ck-api; then