From b1d85c20e36adac9eaee584ef095d9c010cc1dc4 Mon Sep 17 00:00:00 2001 From: ricolin Date: Tue, 9 Sep 2025 00:16:49 +0800 Subject: [PATCH] Use octavia wsgi module wsgi script octavia-wsgi has been deleted from octavia.wsgi Signed-off-by: ricolin Change-Id: Ia31386a9d982c370d21c5188298456d310165576 Signed-off-by: Vladimir Kozhukalov --- octavia/values.yaml | 2 +- releasenotes/notes/octavia-171c56de7891c86d.yaml | 6 ++++++ values_overrides/octavia/2025.1-ubuntu_jammy.yaml | 5 +++++ values_overrides/octavia/2025.1-ubuntu_noble.yaml | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/octavia-171c56de7891c86d.yaml diff --git a/octavia/values.yaml b/octavia/values.yaml index c271765b40..f5f698d7ee 100644 --- a/octavia/values.yaml +++ b/octavia/values.yaml @@ -395,7 +395,7 @@ conf: route-user-agent: '^kube-probe.* donotlog:' thunder-lock: true worker-reload-mercy: 80 - wsgi-file: /var/lib/openstack/bin/octavia-wsgi + module: "octavia.wsgi.api:application" secrets: identity: diff --git a/releasenotes/notes/octavia-171c56de7891c86d.yaml b/releasenotes/notes/octavia-171c56de7891c86d.yaml new file mode 100644 index 0000000000..80b0e05e7d --- /dev/null +++ b/releasenotes/notes/octavia-171c56de7891c86d.yaml @@ -0,0 +1,6 @@ +--- +octavia: + - | + Directly use module for Octavia API UWSGI as WSGI script octavia-wsgi has + removed from Octavia. +... diff --git a/values_overrides/octavia/2025.1-ubuntu_jammy.yaml b/values_overrides/octavia/2025.1-ubuntu_jammy.yaml index bc5a0c2f7f..1c08f3ddea 100644 --- a/values_overrides/octavia/2025.1-ubuntu_jammy.yaml +++ b/values_overrides/octavia/2025.1-ubuntu_jammy.yaml @@ -20,4 +20,9 @@ images: octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_jammy octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy +conf: + octavia_api_uwsgi: + uwsgi: + # in 2025.2 the wsgi script was removed + wsgi-file: /var/lib/openstack/bin/octavia-wsgi ... diff --git a/values_overrides/octavia/2025.1-ubuntu_noble.yaml b/values_overrides/octavia/2025.1-ubuntu_noble.yaml index 5098da3d57..53fef50b2e 100644 --- a/values_overrides/octavia/2025.1-ubuntu_noble.yaml +++ b/values_overrides/octavia/2025.1-ubuntu_noble.yaml @@ -20,4 +20,9 @@ images: octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_noble octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble +conf: + octavia_api_uwsgi: + uwsgi: + # in 2025.2 the wsgi script was removed + wsgi-file: /var/lib/openstack/bin/octavia-wsgi ...