Revert "Re-enable uWSGI as default for Neutron"

This reverts commit 48a935d7c8a8a96d6e66f0cc1b4b7fb7b33760bb.

Reason for revert: A bug was reported regarding uWSGI issue with multinode
setup

Change-Id: Id38a671ff8b5535f232c09a8365963f613eb5bc8
Closes-Bug: #2096937
This commit is contained in:
Dmitriy Rabotyagov 2025-01-30 15:26:21 +00:00 committed by Dmitriy Rabotyagov
parent 48a935d7c8
commit e41f2f5205
3 changed files with 20 additions and 29 deletions

View File

@ -183,19 +183,18 @@ _neutron_rootwrap_conf_overrides:
neutron_rootwrap_conf_overrides: {}
neutron_api_uwsgi_ini_overrides: {}
neutron_periodic_workers_init_overrides: {}
neutron_rpc_server_init_overrides: {}
neutron_server_init_overrides: {}
neutron_rpc_server_init_overrides: {}
neutron_sriov_nic_agent_ini_overrides: {}
neutron_sriov_nic_agent_init_overrides: {}
neutron_ovn_maintenance_init_overrides: {}
neutron_ovn_metadata_agent_ini_overrides: {}
neutron_ovn_metadata_agent_init_overrides: {}
###
### UWSGI
###
neutron_use_uwsgi: True
# NOTE(noonedeadpunk): uWSGI is still not fully supported. See: https://bugs.launchpad.net/neutron/+bug/1912359
neutron_use_uwsgi: False
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,17 @@
---
upgrade:
- |
A uWSGI for Neutron has been disabled again by default in favor of eventlet
server. This also stops and disables following services needed for uWSGI mode:
* ``neutron-periodic-workers``
* ``neutron-ovn-maintenance-worker``
* ``neutron-rpc-server``
fixes:
- |
A `bug <https://bugs.launchpad.net/openstack-ansible/+bug/2096937>`_
related to HashRing generation has been reported when using uWSGI
with Neutron. In order to quickly address the bug, uWSGI mode has been
disabled again by default for Neutron until a proper fix is provided for
uWSGI.

View File

@ -513,31 +513,6 @@ neutron_services:
{% if ('ml2.genericswitch' in neutron_plugin_types) -%}
--config-file {{ neutron_conf_dir }}/{{ neutron_plugins['ml2.genericswitch'].plugin_ini }}
{% endif %}
neutron-periodic-workers:
group: neutron_server
service_name: neutron-periodic-workers
service_en: True
enabled: "{{ neutron_use_uwsgi }}"
state: "{{ neutron_use_uwsgi | ternary('started', 'stopped') }}"
init_config_overrides: "{{ neutron_periodic_workers_init_overrides | combine(neutron_server_init_overrides) }}"
start_order: 2
execstarts: >-
{{ neutron_bin }}/neutron-periodic-workers --config-file {{ neutron_conf_dir }}/neutron.conf
--config-file {{ neutron_conf_dir }}/{{ neutron_plugins[neutron_plugin_type].plugin_ini }}
{% if ('ml2.genericswitch' in neutron_plugin_types) -%}
--config-file {{ neutron_conf_dir }}/{{ neutron_plugins['ml2.genericswitch'].plugin_ini }}
{% endif %}
neutron-ovn-maintenance-worker:
group: neutron_server
service_name: neutron-ovn-maintenance-worker
service_en: "{{ neutron_plugin_type == 'ml2.ovn' }}"
enabled: "{{ neutron_use_uwsgi and neutron_plugin_type == 'ml2.ovn' }}"
state: "{{ (neutron_use_uwsgi and 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: >-
{{ neutron_bin }}/neutron-ovn-maintenance-worker --config-file {{ neutron_conf_dir }}/neutron.conf
--config-file {{ neutron_conf_dir }}/{{ neutron_plugins[neutron_plugin_type].plugin_ini }}
neutron-sriov-nic-agent:
group: neutron_sriov_nic_agent
service_name: neutron-sriov-nic-agent