diff --git a/defaults/main.yml b/defaults/main.yml index 5dea6942..81aa0292 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -249,7 +249,7 @@ octavia_services: start_order: 4 init_config_overrides: "{{ octavia_api_init_overrides }}" wsgi_app: true - wsgi_name: octavia-wsgi + wsgi: "octavia.wsgi.api:application" uwsgi_overrides: "{{ octavia_api_uwsgi_ini_overrides }}" uwsgi_port: "{{ octavia_service_port }}" uwsgi_bind_address: "{{ octavia_uwsgi_bind_address }}" diff --git a/vars/main.yml b/vars/main.yml index 1cee33b3..ba97042e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -73,7 +73,6 @@ uwsgi_octavia_services: |- and ('wsgi_app' in value and value['wsgi_app']) %} {% set _ = value.update( { - 'wsgi_path': octavia_bin ~ '/' ~ value.wsgi_name, 'wsgi_venv': ((octavia_install_method == 'source') | ternary(octavia_bin | dirname, None)), 'uwsgi_uid': octavia_system_user_name, 'uwsgi_guid': octavia_system_group_name, diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 474efb94..c7a62949 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -14,11 +14,6 @@ # limitations under the License. - job: - name: openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy + name: openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble parent: openstack-ansible-deploy-aio - nodeset: ubuntu-jammy - -- job: - name: openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-9 + nodeset: ubuntu-noble diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index af5df09f..5938dbdd 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -24,13 +24,7 @@ check: jobs: - - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy - - openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9 - - openstack-ansible-deploy-aio_metal-centos-9-stream: - voting: false + - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble gate: jobs: - - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-jammy - - openstack-ansible-deploy-aio_lxc_ovnprovider-rockylinux-9 - - openstack-ansible-deploy-aio_metal-centos-9-stream: - voting: false + - openstack-ansible-deploy-aio_lxc_ovnprovider-ubuntu-noble