openstack
/
puppet-designate
Code Issues Proposed changes

Fix ineffective max_header_line 

The [service:api] max_header_line parameter has had no effect since
Train and it was effectively replaced by the [DEFAULT] max_header_line
parameter provided by oslo.service.

This updates the parameter definition accordingly.

Closes-Bug: #1967825
Change-Id: Ia969cc31b380950a87c0be0b911cc214b4219d82
This commit is contained in:
Takashi Kajinami 2022-05-17 10:59:28 +09:00
parent 65592d2046
commit f39567e17b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/api.pp
View File

@ -139,7 +139,7 @@ class designate::api (
'service:api/workers' : value => $workers;
'service:api/threads' : value => $threads;
'service:api/enable_host_header' : value => $enable_host_header;
'service:api/max_header_line' : value => $max_header_line;
'DEFAULT/max_header_line' : value => $max_header_line;
'service:api/default_limit_admin' : value => $default_limit_admin;
'service:api/max_limit_admin' : value => $max_limit_admin;
'service:api/default_limit_v2' : value => $default_limit_v2;
@ -150,6 +150,11 @@ class designate::api (
'service:api/quotas_verify_project_id' : value => $quotas_verify_project_id;
}
# TODO(tkajinam): Remove this after Zed release
designate_config {
'service:api/max_header_line': ensure => absent;
}
if $auth_strategy == 'keystone' {
include designate::keystone::authtoken
}

4
spec/classes/designate_api_spec.rb
View File

@ -40,7 +40,7 @@ describe 'designate::api' do
is_expected.to contain_designate_config('service:api/workers').with_value(8)
is_expected.to contain_designate_config('service:api/threads').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/enable_host_header').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/max_header_line').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('DEFAULT/max_header_line').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/default_limit_admin').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/max_limit_admin').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/default_limit_v2').with_value('<SERVICE DEFAULT>')
@ -89,7 +89,7 @@ describe 'designate::api' do
is_expected.to contain_designate_config('service:api/workers').with_value(params[:workers])
is_expected.to contain_designate_config('service:api/threads').with_value(params[:threads])
is_expected.to contain_designate_config('service:api/enable_host_header').with_value(params[:enable_host_header])
is_expected.to contain_designate_config('service:api/max_header_line').with_value(params[:max_header_line])
is_expected.to contain_designate_config('DEFAULT/max_header_line').with_value(params[:max_header_line])
is_expected.to contain_designate_config('service:api/default_limit_admin').with_value(params[:default_limit_admin])
is_expected.to contain_designate_config('service:api/max_limit_admin').with_value(params[:max_limit_admin])
is_expected.to contain_designate_config('service:api/default_limit_v2').with_value(params[:default_limit_v2])