Merge "Deprecate and remove neutron_use_uwsgi variable"

This commit is contained in:
Zuul
2025-11-07 14:51:00 +00:00
committed by Gerrit Code Review
3 changed files with 23 additions and 8 deletions

View File

@@ -192,7 +192,6 @@ neutron_ovn_metadata_agent_init_overrides: {}
###
### UWSGI
###
neutron_use_uwsgi: true
neutron_wsgi_processes_max: 16
neutron_wsgi_processes: "{{ [[ansible_facts['processor_vcpus'] | default(1), 1] | max * 2, neutron_wsgi_processes_max] | min }}"
neutron_wsgi_threads: 1

View File

@@ -0,0 +1,16 @@
---
deprecations:
- |
Variable ``neutron_use_uwsgi`` has been removed and has no effect, since
eventlet mode for ``neutron-server`` has been dropped in 2025.2 (Flamingo).
uWSGI is the only supported mode at the moment.
upgrade:
- |
With removal of eventlet mode for ``neutron-server`` in Neutron, the only
supported mode for the service is uWSGI. All deployments using eventlet
will be migrated to uWSGI mode for ``neutron-server``. With that multiple
extra mandatory services will be started together with ``neutron-server``,
like ``neutron-rpc-server``, ``neutron-periodic-workers`` and
``neutron-ovn-maintenance-worker`` for OVN-based deployments.

View File

@@ -450,7 +450,7 @@ neutron_services:
service_name: neutron-server
service_en: true
start_order: 1
wsgi_app: "{{ neutron_use_uwsgi | bool }}"
wsgi_app: true
uwsgi_overrides: "{{ neutron_api_uwsgi_ini_overrides }}"
uwsgi_bind_address: "{{ neutron_api_bind_address }}"
uwsgi_port: "{{ neutron_service_port }}"
@@ -472,8 +472,8 @@ neutron_services:
group: neutron_server
service_name: neutron-rpc-server
service_en: true
enabled: "{{ neutron_use_uwsgi | bool }}"
state: "{{ (neutron_use_uwsgi | bool) | ternary('started', 'stopped') }}"
enabled: true
state: started
init_config_overrides: "{{ neutron_rpc_server_init_overrides | combine(neutron_server_init_overrides) }}"
start_order: 2
execstarts: >-
@@ -486,8 +486,8 @@ neutron_services:
group: neutron_server
service_name: neutron-periodic-workers
service_en: true
enabled: "{{ neutron_use_uwsgi | bool }}"
state: "{{ (neutron_use_uwsgi | bool) | ternary('started', 'stopped') }}"
enabled: true
state: started
init_config_overrides: "{{ neutron_periodic_workers_init_overrides | combine(neutron_server_init_overrides) }}"
start_order: 2
execstarts: >-
@@ -500,8 +500,8 @@ neutron_services:
group: neutron_server
service_name: neutron-ovn-maintenance-worker
service_en: "{{ neutron_plugin_type == 'ml2.ovn' }}"
enabled: "{{ neutron_use_uwsgi | bool and neutron_plugin_type == 'ml2.ovn' }}"
state: "{{ (neutron_use_uwsgi | bool and neutron_plugin_type == 'ml2.ovn') | ternary('started', 'stopped') }}"
enabled: "{{ neutron_plugin_type == 'ml2.ovn' }}"
state: "{{ (neutron_plugin_type == 'ml2.ovn') | ternary('started', 'stopped') }}"
init_config_overrides: "{{ neutron_ovn_maintenance_init_overrides | combine(neutron_server_init_overrides) }}"
start_order: 2
execstarts: >-