From ca074bf6b2fa13adb7ebb7635be3ef8ad399fd69 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 21 May 2025 10:54:14 +0100 Subject: [PATCH] Switch from wsgi script to wsgi module Change-Id: I78fb8575f522e8f1b09dd61002df4688a7fafedc --- defaults/main.yml | 4 ++-- vars/main.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2c9ad47..dbcd94b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -266,7 +266,7 @@ heat_services: init_config_overrides: "{{ heat_api_init_overrides }}" start_order: 2 wsgi_app: true - wsgi_name: heat-wsgi-api + wsgi: "heat.wsgi.api:application" uwsgi_overrides: "{{ heat_api_uwsgi_ini_overrides }}" uwsgi_port: "{{ heat_service_port }}" uwsgi_bind_address: "{{ heat_api_uwsgi_bind_address }}" @@ -277,7 +277,7 @@ heat_services: init_config_overrides: "{{ heat_api_cfn_init_overrides }}" start_order: 3 wsgi_app: true - wsgi_name: heat-wsgi-api-cfn + wsgi: "heat.wsgi.cfn:application" uwsgi_overrides: "{{ heat_api_cfn_uwsgi_ini_overrides }}" uwsgi_port: "{{ heat_cfn_service_port }}" uwsgi_bind_address: "{{ heat_api_cfn_uwsgi_bind_address }}" diff --git a/vars/main.yml b/vars/main.yml index 9a42db5..3b7b634 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -66,7 +66,6 @@ heat_uwsgi_services: |- and ('wsgi_app' in value and value['wsgi_app']) %} {% set _ = value.update( { - 'wsgi_path': heat_bin ~ '/' ~ value.wsgi_name, 'wsgi_venv': ((heat_install_method == 'source') | ternary(heat_bin | dirname, None)), 'uwsgi_uid': heat_system_user_name, 'uwsgi_guid': heat_system_group_name,