openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Add support for oslo_middleware/enable_proxy_headers_parsing"

This commit is contained in:
Zuul 2021-07-15 18:56:42 +00:00 committed by Gerrit Code Review
parent e5373dac04 5c7d7e6d58
commit 37fde00403
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
manifests/api.pp
View File

@ -84,6 +84,11 @@
# (optional) Admin API extensions.
# Defaults to $::os_service_default
#
# [*enable_proxy_headers_parsing*]
# (Optional) Enable paste middleware to handle SSL requests through
# HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*service_ensure*]
@ -91,28 +96,29 @@
# Defaults to 'DEPRECATED'
#
class designate::api (
$package_ensure = present,
$api_package_name = $::designate::params::api_package_name,
$enabled = true,
$manage_service = true,
$auth_strategy = $::os_service_default,
$enable_api_v2 = $::os_service_default,
$enable_api_admin = $::os_service_default,
$api_base_uri = $::os_service_default,
$listen = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$enable_host_header = $::os_service_default,
$max_header_line = $::os_service_default,
$default_limit_admin = $::os_service_default,
$max_limit_admin = $::os_service_default,
$default_limit_v2 = $::os_service_default,
$max_limit_v2 = $::os_service_default,
$pecan_debug = $::os_service_default,
$enabled_extensions_v2 = $::os_service_default,
$enabled_extensions_admin = $::os_service_default,
$package_ensure = present,
$api_package_name = $::designate::params::api_package_name,
$enabled = true,
$manage_service = true,
$auth_strategy = $::os_service_default,
$enable_api_v2 = $::os_service_default,
$enable_api_admin = $::os_service_default,
$api_base_uri = $::os_service_default,
$listen = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$enable_host_header = $::os_service_default,
$max_header_line = $::os_service_default,
$default_limit_admin = $::os_service_default,
$max_limit_admin = $::os_service_default,
$default_limit_v2 = $::os_service_default,
$max_limit_v2 = $::os_service_default,
$pecan_debug = $::os_service_default,
$enabled_extensions_v2 = $::os_service_default,
$enabled_extensions_admin = $::os_service_default,
$enable_proxy_headers_parsing = $::os_service_default,
# DEPRECATED PARAMETERS
$service_ensure = 'DEPRECATED',
$service_ensure = 'DEPRECATED',
) inherits designate {
include designate::deps
@ -148,6 +154,10 @@ class designate::api (
include designate::keystone::authtoken
}
oslo::middleware { 'designate_config':
enable_proxy_headers_parsing => $enable_proxy_headers_parsing
}
designate::generic_service { 'api':
enabled => $enabled,
manage_service => $manage_service_real,

5
releasenotes/notes/add-enable_proxy_headers_parsing-fb76fa3450bd4ed9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``designate::api::enable_proxy_headers_parsing`` parameter has been
added.

7
spec/classes/designate_api_spec.rb
View File

@ -49,6 +49,9 @@ describe 'designate::api' do
is_expected.to contain_designate_config('service:api/enabled_extensions_v2').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/enabled_extensions_admin').with_value('<SERVICE DEFAULT>')
is_expected.to_not contain_designate__keystone__authtoken('designate_config')
is_expected.to contain_oslo__middleware('designate_config').with(
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>'
)
end
end
@ -71,6 +74,7 @@ describe 'designate::api' do
:pecan_debug => true,
:enabled_extensions_v2 => 'experimental',
:enabled_extensions_admin => 'reports,quotas,counts,tenants,target_sync',
:enable_proxy_headers_parsing => true,
})
end
@ -91,6 +95,9 @@ describe 'designate::api' do
is_expected.to contain_designate_config('service:api/pecan_debug').with_value(params[:pecan_debug])
is_expected.to contain_designate_config('service:api/enabled_extensions_v2').with_value(params[:enabled_extensions_v2])
is_expected.to contain_designate_config('service:api/enabled_extensions_admin').with_value(params[:enabled_extensions_admin])
is_expected.to contain_oslo__middleware('designate_config').with(
:enable_proxy_headers_parsing => params[:enable_proxy_headers_parsing]
)
end
end