openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Switch from wsgi script to wsgi module

Browse Source 
Also drop jammy CI jobs and switch to noble to be compatible
with 2025.2 branch.

Change-Id: Iddd3290bb329722cade09a35b9c9a8727ae0f1b5
This commit is contained in:
Jonathan Rosser
2025-05-22 20:37:38 +01:00
parent b902d05b7a
commit f9cf3bd677
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@@ -249,7 +249,7 @@ octavia_services:
start_order: 4 start_order: 4
init_config_overrides: "{{ octavia_api_init_overrides }}" init_config_overrides: "{{ octavia_api_init_overrides }}"
wsgi_app: true wsgi_app: true
wsgi_name: octavia-wsgi wsgi: "octavia.wsgi.api:application"
uwsgi_overrides: "{{ octavia_api_uwsgi_ini_overrides }}" uwsgi_overrides: "{{ octavia_api_uwsgi_ini_overrides }}"
uwsgi_port: "{{ octavia_service_port }}" uwsgi_port: "{{ octavia_service_port }}"
uwsgi_bind_address: "{{ octavia_uwsgi_bind_address }}" uwsgi_bind_address: "{{ octavia_uwsgi_bind_address }}"

1
vars/main.yml
View File

@@ -73,7 +73,6 @@ uwsgi_octavia_services: |-
and ('wsgi_app' in value and value['wsgi_app']) %} and ('wsgi_app' in value and value['wsgi_app']) %}
{% set _ = value.update( {% set _ = value.update(
{ {
'wsgi_path': octavia_bin ~ '/' ~ value.wsgi_name,
'wsgi_venv': ((octavia_install_method == 'source') | ternary(octavia_bin | dirname, None)), 'wsgi_venv': ((octavia_install_method == 'source') | ternary(octavia_bin | dirname, None)),
'uwsgi_uid': octavia_system_user_name, 'uwsgi_uid': octavia_system_user_name,
'uwsgi_guid': octavia_system_group_name, 'uwsgi_guid': octavia_system_group_name,

9
zuul.d/jobs.yaml
View File

@@ -14,11 +14,6 @@
# limitations under the License. # limitations under the License.
- job: - job:
name: openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy name: openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble
parent: openstack-ansible-deploy-aio parent: openstack-ansible-deploy-aio
nodeset: ubuntu-jammy nodeset: ubuntu-noble
- job:
name: openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9
parent: openstack-ansible-deploy-aio
nodeset: rockylinux-9

10
zuul.d/project.yaml
View File

@@ -24,13 +24,7 @@
check: check:
jobs: jobs:
- openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble
- openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9
- openstack-ansible-deploy-aio_metal-centos-9-stream:
voting: false
gate: gate:
jobs: jobs:
- openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble
- openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9
- openstack-ansible-deploy-aio_metal-centos-9-stream:
voting: false