openstack/kolla-ansible
Code Issues Proposed changes

Horizon: fix for Debian

Browse Source 
Depends-On: https://review.opendev.org/686316
Change-Id: I5f204541cc44bca94bed756bb3af3e102f81a1d2
This commit is contained in:
Viktor Michalek 2019-10-01 14:57:02 +02:00
parent c8509dbeac
commit d3ae9bf1a9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/horizon/templates/horizon.conf.j2
View File

@ -15,7 +15,11 @@ TraceEnable off
WSGIScriptReloading On WSGIScriptReloading On
WSGIDaemonProcess horizon-http processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }} WSGIDaemonProcess horizon-http processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }}
WSGIProcessGroup horizon-http WSGIProcessGroup horizon-http
{% if kolla_base_distro in ['debian'] and horizon_install_type == 'binary' %}
WSGIScriptAlias / {{ python_path }}/wsgi.py
{% else %}
WSGIScriptAlias / {{ python_path }}/openstack_dashboard/wsgi/django.wsgi WSGIScriptAlias / {{ python_path }}/openstack_dashboard/wsgi/django.wsgi
{% endif %}
WSGIPassAuthorization On WSGIPassAuthorization On
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
@ -23,7 +27,7 @@ TraceEnable off
Require all granted Require all granted
</Location> </Location>
{% if kolla_base_distro == 'ubuntu' and horizon_install_type == 'binary' %} {% if kolla_base_distro in ['debian', 'ubuntu'] and horizon_install_type == 'binary' %}
Alias /static /var/lib/openstack-dashboard/static Alias /static /var/lib/openstack-dashboard/static
{% else %} {% else %}
Alias /static {{ python_path }}/static Alias /static {{ python_path }}/static