From 5ec1f6ab00a070693d1ac1d88690f913e56089f9 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 20 Feb 2025 10:27:30 +0100
Subject: [PATCH] Return defenition for wsgi-required workers

During revert of the change Id38a671ff8b5535f232c09a8365963f613eb5bc8 it
was also accidentally reverted introduction of services which
were required for uWSGI mode.

Without these services being defined, they will not be stopped/managed
while disabling uWSGI on upgrade.

Change-Id: I21302b2cccea794fdf567056eee52ac073aadfb2
---
 defaults/main.yml |  2 ++
 vars/main.yml     | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index c487a1d9..91e3a5b6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -183,10 +183,12 @@ _neutron_rootwrap_conf_overrides:
 neutron_rootwrap_conf_overrides: {}
 
 neutron_api_uwsgi_ini_overrides: {}
+neutron_periodic_workers_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: {}
 
diff --git a/vars/main.yml b/vars/main.yml
index ef5eea46..509676e0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -507,6 +507,31 @@ 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