openstack/devstack
Code Issues Proposed changes

Merge "Deal with different django-admin executables"

Browse Source
This commit is contained in:
Jenkins
2014-11-19 05:28:26 +00:00
committed by Gerrit Code Review
parent 2dab788c85 088e66028c
commit 5477b082f8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/horizon
View File

@@ -142,8 +142,16 @@ function init_horizon {
# and run_process
sudo rm -f /var/log/$APACHE_NAME/horizon_*
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py collectstatic --noinput
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py compress --force
# 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
}