diff --git a/defaults/main.yml b/defaults/main.yml index 08ca85d3..2a99a294 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -149,7 +149,7 @@ horizon_help_url: https://docs.openstack.org/horizon/latest/user/ ## Installation directories horizon_lib_dir: "{{ _horizon_lib_dir }}" -horizon_lib_wsgi_file: "{{ horizon_lib_dir }}/openstack_dashboard/wsgi/django.wsgi" +horizon_lib_wsgi_file: "{{ horizon_lib_dir }}/openstack_dashboard/wsgi.py" horizon_endpoint_type: internalURL diff --git a/tasks/horizon_post_install.yml b/tasks/horizon_post_install.yml index 7de18b22..34c6c60f 100644 --- a/tasks/horizon_post_install.yml +++ b/tasks/horizon_post_install.yml @@ -59,16 +59,6 @@ with_items: - { src: "/etc/horizon/local_settings.py", dest: "{{ horizon_lib_dir }}/openstack_dashboard/local/local_settings.py" } -- name: Setup Horizon config(s) - template: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - owner: "{{ horizon_system_user_name }}" - group: "{{ horizon_system_group_name }}" - with_items: - - { src: "horizon_django.wsgi.j2", dest: "{{ horizon_lib_wsgi_file }}" } - notify: Restart apache2 - - name: Create customization module directory file: path: "{{ horizon_lib_dir }}/horizon_customization" diff --git a/templates/horizon_django.wsgi.j2 b/templates/horizon_django.wsgi.j2 deleted file mode 100644 index b7fbe818..00000000 --- a/templates/horizon_django.wsgi.j2 +++ /dev/null @@ -1,14 +0,0 @@ -import logging -import os -import sys -from django.core.wsgi import get_wsgi_application -from django.conf import settings - -# Add this file path to sys.path in order to import settings -sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../..'))) -os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings' -sys.stdout = sys.stderr - -DEBUG = False - -application = get_wsgi_application()