From 92d6e27c5e7c83d7c2cacbe4c83be37dd84aa4ca Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 23 Nov 2022 21:12:09 +0100
Subject: [PATCH] Fix some neutron configuration options
Move metadata_workers from neutron.conf to metadata_agent.ini.
Remove unknown option placement/os_region_name: we already have
placement/region_name which is the correct one.
This can be backported to previous releases.
Change-Id: I710b5364244d976020656e1ee68e89f337cb3086
---
ansible/roles/neutron/templates/metadata_agent.ini.j2 | 1 +
ansible/roles/neutron/templates/neutron.conf.j2 | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ansible/roles/neutron/templates/metadata_agent.ini.j2 b/ansible/roles/neutron/templates/metadata_agent.ini.j2
index cdee21fcbb..c66cb4dd22 100644
--- a/ansible/roles/neutron/templates/metadata_agent.ini.j2
+++ b/ansible/roles/neutron/templates/metadata_agent.ini.j2
@@ -5,3 +5,4 @@ nova_metadata_host = {{ nova_internal_fqdn }}
nova_metadata_port = {{ nova_metadata_port }}
metadata_proxy_shared_secret = {{ metadata_secret }}
nova_metadata_protocol = {{ internal_protocol }}
+metadata_workers = {{ neutron_metadata_workers }}
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 62bd1711cb..e47eaa51d0 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -18,7 +18,6 @@ bind_port = {{ neutron_server_listen_port }}
api_paste_config = /etc/neutron/api-paste.ini
api_workers = {{ neutron_api_workers }}
-metadata_workers = {{ neutron_metadata_workers }}
rpc_workers = {{ openstack_service_rpc_workers }}
rpc_state_report_workers = {{ openstack_service_rpc_workers }}
@@ -192,7 +191,6 @@ password = {{ placement_keystone_password }}
user_domain_name = {{ default_user_domain_name }}
project_name = service
project_domain_name = {{ default_project_domain_name }}
-os_region_name = {{ openstack_region_name }}
endpoint_type = internal
cafile = {{ openstack_cacert }}
region_name = {{ openstack_region_name }}
--
GitLab