openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Fix theme rendering for kilo 

Set WEBROOT in openstack-dashboard's local_settings.py to the value
of webroot from the charm's config (see config.yaml).

Add /horizon/static alias to apache2 config in addition to /static
to cover both paths to static resources.

Change-Id: I29a156d322bac91ca02fb0f08f291fc805e59110
Closes-Bug: #1728086
This commit is contained in:
Corey Bryant 2017-10-27 19:44:54 +00:00
parent a055181658
commit 5e0f9e508b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/local_settings.py
View File

@ -508,6 +508,8 @@ except ImportError:
pass
{% endif %}
WEBROOT = '{{ webroot }}'
# Default Ubuntu apache configuration uses /horizon as the application root.
# Configure auth redirects here accordingly.
{% if webroot == "/" %}

1
templates/icehouse/openstack-dashboard.conf
View File

@ -5,6 +5,7 @@ WSGIProcessGroup horizon
WSGIPythonHome {{ virtualenv }}
{% endif %}
Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
Alias /horizon/static /usr/share/openstack-dashboard/openstack_dashboard/static/
<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
Order allow,deny
Allow from all