From d3ae9bf1a96aae3472033f194544675e00e346be Mon Sep 17 00:00:00 2001 From: Viktor Michalek Date: Tue, 1 Oct 2019 14:57:02 +0200 Subject: [PATCH] Horizon: fix for Debian Depends-On: https://review.opendev.org/686316 Change-Id: I5f204541cc44bca94bed756bb3af3e102f81a1d2 --- ansible/roles/horizon/templates/horizon.conf.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/horizon/templates/horizon.conf.j2 b/ansible/roles/horizon/templates/horizon.conf.j2 index b03bd4b403..cef86f374d 100644 --- a/ansible/roles/horizon/templates/horizon.conf.j2 +++ b/ansible/roles/horizon/templates/horizon.conf.j2 @@ -15,7 +15,11 @@ TraceEnable off WSGIScriptReloading On 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 +{% 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 +{% endif %} WSGIPassAuthorization On WSGIApplicationGroup %{GLOBAL} @@ -23,7 +27,7 @@ TraceEnable off Require all granted -{% 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 {% else %} Alias /static {{ python_path }}/static