openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "ovn-meta: Stop overriding metadata_workers"

This commit is contained in:
Zuul 2023-03-14 03:39:38 +00:00 committed by Gerrit Code Review
parent 33fa050510 aa44439649
commit 5daecd44ec
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/agents/ovn_metadata.pp
View File

@ -21,28 +21,34 @@
# Debug. Defaults to false.
#
# [*auth_ca_cert*]
# CA cert to check against with for ssl keystone. (Defaults to $facts['os_service_default'])
# CA cert to check against with for ssl keystone.
# Defaults to $facts['os_service_default'].
#
# [*nova_client_cert*]
# Client certificate for nova metadata api server. (Defaults to $facts['os_service_default'])
# Client certificate for nova metadata api server.
# Defaults to $facts['os_service_default'].
#
# [*nova_client_priv_key*]
# Private key of client certificate. (Defaults to $facts['os_service_default'])
# Private key of client certificate.
# Defaults to $facts['os_service_default'].
#
# [*metadata_host*]
# The hostname of the metadata service. Defaults to $facts['os_service_default'].
# The hostname of the metadata service.
# Defaults to $facts['os_service_default'].
#
# [*metadata_port*]
# The TCP port of the metadata service. Defaults to $facts['os_service_default'].
# The TCP port of the metadata service.
# Defaults to $facts['os_service_default'].
#
# [*metadata_protocol*]
# The protocol to use for requests to Nova metadata server. Defaults to $facts['os_service_default'].
# The protocol to use for requests to Nova metadata server.
# Defaults to $facts['os_service_default'].
#
# [*metadata_workers*]
# (optional) Number of separate worker processes to spawn. Greater than 0
# launches that number of child processes as workers. The parent process
# manages them.
# Defaults to: 2
# Defaults to: $facts['os_service_defaut']
#
# [*metadata_backlog*]
# (optional) Number of backlog requests to configure the metadata server socket with.
@ -122,7 +128,7 @@ class neutron::agents::ovn_metadata (
$metadata_host = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$metadata_protocol = $facts['os_service_default'],
$metadata_workers = 2,
$metadata_workers = $facts['os_service_default'],
$metadata_backlog = $facts['os_service_default'],
$metadata_insecure = $facts['os_service_default'],
$nova_client_cert = $facts['os_service_default'],

2
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -56,7 +56,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_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/metadata_workers').with(:value => 2)
should contain_ovn_metadata_agent_config('DEFAULT/metadata_workers').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/state_path').with(:value => params[:state_path])