diff --git a/manifests/api.pp b/manifests/api.pp index 9d12ed10..be40f29f 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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 # # [*ovn_nb_connection*] @@ -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 $ovn_nb_connection = undef ) inherits octavia::params { @@ -212,6 +217,7 @@ class octavia::api ( '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': diff --git a/releasenotes/notes/allow_ping_health_monitors-3f00c296714b663b.yaml b/releasenotes/notes/allow_ping_health_monitors-3f00c296714b663b.yaml new file mode 100644 index 00000000..23ad3add --- /dev/null +++ b/releasenotes/notes/allow_ping_health_monitors-3f00c296714b663b.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Added parameter ``allow_ping_health_monitors`` to the ``octavia::api`` class diff --git a/spec/classes/octavia_api_spec.rb b/spec/classes/octavia_api_spec.rb index bb1346a0..151dfe29 100644 --- a/spec/classes/octavia_api_spec.rb +++ b/spec/classes/octavia_api_spec.rb @@ -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('') is_expected.to contain_octavia_config('api_settings/default_pool_tls_versions').with_value('') is_expected.to contain_octavia_config('api_settings/minimum_tls_version').with_value('') + is_expected.to contain_octavia_config('api_settings/allow_ping_health_monitors').with_value('') is_expected.to contain_oslo__middleware('octavia_config').with( :enable_proxy_headers_parsing => '', ) @@ -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|