Merge "[OVN] Change the default metadata_workers to 2"

This commit is contained in:
Zuul 2020-02-10 18:32:15 +00:00 committed by Gerrit Code Review
commit 46cd24bf1a
3 changed files with 14 additions and 3 deletions

View File

@ -45,7 +45,7 @@
# (optional) Number of separate worker processes to spawn. Greater than 0 # (optional) Number of separate worker processes to spawn. Greater than 0
# launches that number of child processes as workers. The parent process # launches that number of child processes as workers. The parent process
# manages them. # manages them.
# Defaults to: $::os_workers # Defaults to: 2
# #
# [*metadata_backlog*] # [*metadata_backlog*]
# (optional) Number of backlog requests to configure the metadata server socket with. # (optional) Number of backlog requests to configure the metadata server socket with.
@ -121,7 +121,7 @@ class neutron::agents::ovn_metadata (
$metadata_host = $::os_service_default, $metadata_host = $::os_service_default,
$metadata_port = $::os_service_default, $metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default, $metadata_protocol = $::os_service_default,
$metadata_workers = $::os_workers, $metadata_workers = 2,
$metadata_backlog = $::os_service_default, $metadata_backlog = $::os_service_default,
$metadata_insecure = $::os_service_default, $metadata_insecure = $::os_service_default,
$nova_client_cert = $::os_service_default, $nova_client_cert = $::os_service_default,

View File

@ -0,0 +1,11 @@
---
upgrade:
- |
Switched the default value of the ``metadata_workers`` configuration
option for the OVN metadata agents to 2 (from $::os_workers). While
the OVS metadata agents runs on the controllers/gateway nodes (and
defaults to $::os_workers) the OVN metadata agents are distributed
and runs on the compute nodes instead so, there's no point in running
dozen of them on each compute. Also, by reducing the number of workers
we also reduce the burden on the OVSDB that the OVN metadata agent
connects to making OVN more scalable.

View File

@ -57,7 +57,7 @@ describe 'neutron::agents::ovn_metadata' do
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_host').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_host').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_port').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_port').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/metadata_workers').with(:value => facts[:os_workers]) should contain_ovn_metadata_agent_config('DEFAULT/metadata_workers').with(:value => 2)
should contain_ovn_metadata_agent_config('DEFAULT/metadata_backlog').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/metadata_backlog').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_insecure').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_insecure').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/state_path').with(:value => params[:state_path]) should contain_ovn_metadata_agent_config('DEFAULT/state_path').with(:value => params[:state_path])