Add allow_ping_health_monitors parameter to api

This can be used to set the allow_ping_health_monitors
configuration option in api_settings group

Change-Id: Icdee753af276224c969a3eb0e790d331269893d6
This commit is contained in:
Tobias Urdin 2022-03-31 13:16:01 +00:00 committed by Takashi Kajinami
parent 1dd62c1854
commit c3d78e5cb4
3 changed files with 13 additions and 0 deletions

View File

@ -107,6 +107,10 @@
# (optional) Minimum allowed TLS version for listeners and pools.
# Defaults to $::os_service_default
#
# [*allow_ping_health_monitors*]
# (optional) Allow PING type Health Monitors.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*provider_drivers*]
@ -138,6 +142,7 @@ class octavia::api (
$default_listener_tls_versions = $::os_service_default,
$default_pool_tls_versions = $::os_service_default,
$minimum_tls_version = $::os_service_default,
$allow_ping_health_monitors = $::os_service_default,
# DEPRECATED PARAMETERS
$provider_drivers = undef,
) inherits octavia::params {
@ -219,6 +224,7 @@ Use the enabled_provider_drivers parameter instead.')
'api_settings/default_listener_tls_versions': value => join(any2array($default_listener_tls_versions), ',');
'api_settings/default_pool_tls_versions': value => join(any2array($default_pool_tls_versions), ',');
'api_settings/minimum_tls_version': value => $minimum_tls_version;
'api_settings/allow_ping_health_monitors': value => $allow_ping_health_monitors;
}
oslo::middleware { 'octavia_config':

View File

@ -0,0 +1,4 @@
---
features:
- |
Added parameter ``allow_ping_health_monitors`` to the ``octavia::api`` class

View File

@ -16,6 +16,7 @@ describe 'octavia::api' do
:pagination_max_limit => '1000',
:healthcheck_enabled => true,
:healthcheck_refresh_interval => 5,
:allow_ping_health_monitors => true,
}
end
@ -65,6 +66,7 @@ describe 'octavia::api' do
is_expected.to contain_octavia_config('api_settings/default_listener_tls_versions').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('api_settings/default_pool_tls_versions').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('api_settings/minimum_tls_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('api_settings/allow_ping_health_monitors').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__middleware('octavia_config').with(
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
)
@ -86,6 +88,7 @@ describe 'octavia::api' do
is_expected.to contain_octavia_config('api_settings/pagination_max_limit').with_value( params[:pagination_max_limit] )
is_expected.to contain_octavia_config('api_settings/healthcheck_enabled').with_value( params[:healthcheck_enabled] )
is_expected.to contain_octavia_config('api_settings/healthcheck_refresh_interval').with_value( params[:healthcheck_refresh_interval] )
is_expected.to contain_octavia_config('api_settings/allow_ping_health_monitors').with_value( params[:allow_ping_health_monitors] )
end
[{:enabled => true}, {:enabled => false}].each do |param_hash|