From 15bd50c2f1d80554dd02a58c15ebf9c611204c36 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 20 Aug 2018 14:12:33 +0200 Subject: [PATCH] Django WSGI entrypoint change The Horizon project has changed the old django.wsgi entrypoint to the wsgi.py file in the openstack_dashboard module. The following can be seen in the horizon logs: WARNING:root:Use of this 'djano.wsgi' file has been deprecated since the Rocky release in favor of 'wsgi.py' in the 'openstack_dashboard' module. This file is a legacy naming from before Django 1.4 and an importable 'wsgi.py' is now the default. This file will be removed in the T release cycle. Change-Id: Iee2b3e78768dd55d5cd1629d64c9d2ff9d0d4b93 --- manifests/params.pp | 2 +- .../horizon-django-wsgi-entry-09354eb4692d3836.yaml | 5 +++++ spec/classes/horizon_wsgi_apache_spec.rb | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/horizon-django-wsgi-entry-09354eb4692d3836.yaml diff --git a/manifests/params.pp b/manifests/params.pp index 32a6dafa..7f16b591 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,7 +4,7 @@ class horizon::params { include ::openstacklib::defaults $logdir = '/var/log/horizon' - $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' + $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' $manage_py = '/usr/share/openstack-dashboard/manage.py' $wsgi_application_group = '%{GLOBAL}' diff --git a/releasenotes/notes/horizon-django-wsgi-entry-09354eb4692d3836.yaml b/releasenotes/notes/horizon-django-wsgi-entry-09354eb4692d3836.yaml new file mode 100644 index 00000000..3d2783b1 --- /dev/null +++ b/releasenotes/notes/horizon-django-wsgi-entry-09354eb4692d3836.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Django WSGI entrypoint changed from django.wsgi to wsgi.py file as deprecated + by the Horizon project. diff --git a/spec/classes/horizon_wsgi_apache_spec.rb b/spec/classes/horizon_wsgi_apache_spec.rb index e9e34a00..116c5a09 100644 --- a/spec/classes/horizon_wsgi_apache_spec.rb +++ b/spec/classes/horizon_wsgi_apache_spec.rb @@ -39,7 +39,7 @@ describe 'horizon::wsgi::apache' do :redirectmatch_status => 'permanent', :redirectmatch_regexp => '^/$', :redirectmatch_dest => platforms_params[:root_url], - :wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' }, + :wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' }, :wsgi_process_group => platforms_params[:wsgi_group], :wsgi_daemon_process => platforms_params[:wsgi_group], :wsgi_application_group => '%{GLOBAL}', @@ -83,7 +83,7 @@ describe 'horizon::wsgi::apache' do :redirectmatch_status => 'temp', :redirectmatch_regexp => '^/$', :redirectmatch_dest => platforms_params[:root_url], - :wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' }, + :wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' }, :wsgi_process_group => platforms_params[:wsgi_group], :wsgi_daemon_process => platforms_params[:wsgi_group], :wsgi_application_group => '%{GLOBAL}', @@ -151,7 +151,7 @@ describe 'horizon::wsgi::apache' do :wsgi_daemon_process => 'horizon-ssl', :wsgi_application_group => '%{GLOBAL}', :wsgi_script_aliases => { - platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' + platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' } )} @@ -171,7 +171,7 @@ describe 'horizon::wsgi::apache' do :wsgi_daemon_process => platforms_params[:wsgi_group], :wsgi_application_group => '%{GLOBAL}', :wsgi_script_aliases => { - platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' + platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' } )} end @@ -222,7 +222,7 @@ describe 'horizon::wsgi::apache' do { 'alias' => '/static', 'path' => '/tmp/horizon/static' } ], :wsgi_script_aliases => { - '/' => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' + '/' => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' } )}