From bb14d9c79f6265911f3dc7947ef257a41a3843de Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 20 May 2025 17:00:00 +0100 Subject: [PATCH] Switch from wsgi script to wsgi module Change-Id: Iea05ecc9a2a8352b89ec7e1d3f56554fffcc5d5b --- defaults/main.yml | 2 +- vars/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9e22da57..8c242074 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -313,7 +313,7 @@ glance_services: start_order: 1 execstarts: "{{ glance_bin }}/glance-api" wsgi_app: "{{ glance_use_uwsgi }}" - wsgi_name: glance-wsgi-api + wsgi: "glance.wsgi.api:application" uwsgi_overrides: "{{ glance_api_uwsgi_ini_overrides }}" uwsgi_bind_address: "{{ glance_api_bind_address }}" uwsgi_port: "{{ glance_api_service_port }}" diff --git a/vars/main.yml b/vars/main.yml index 1a4663c1..1fbac950 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -56,7 +56,6 @@ uwsgi_glance_services: |- and ('wsgi_app' in value and value['wsgi_app']) %} {% set _ = value.update( { - 'wsgi_path': glance_bin ~ '/' ~ value.wsgi_name, 'wsgi_venv': ((glance_install_method == 'source') | ternary(glance_bin | dirname, None)), 'uwsgi_uid': glance_system_user_name, 'uwsgi_guid': glance_system_group_name,