openstack/puppet-mistral
Code Issues Proposed changes

healthcheck: Expose ignore_proxied_requests parameter

Browse Source 
Depends-on: https://review.opendev.org/909807
Change-Id: Iccfc9100684e07d25750a95e238b73de9f70ccf3
This commit is contained in:
Takashi Kajinami 2024-02-26 01:51:46 +09:00
parent 8c6cb4c5e4
commit f5d1ba9844
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/healthcheck.pp
View File

@ -22,6 +22,10 @@
# healthcheck information. # healthcheck information.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*ignore_proxied_requests*]
# (Optional) Ignore requests with proxy headers
# Defaults to $facts['os_service_default']
#
# [*disable_by_file_path*] # [*disable_by_file_path*]
# (Optional) Check the presense of a file to determine if an application # (Optional) Check the presense of a file to determine if an application
# is running on a port. # is running on a port.
@ -33,12 +37,13 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class mistral::healthcheck ( class mistral::healthcheck (
$enabled = $facts['os_service_default'], $enabled = $facts['os_service_default'],
$detailed = $facts['os_service_default'], $detailed = $facts['os_service_default'],
$backends = $facts['os_service_default'], $backends = $facts['os_service_default'],
$allowed_source_ranges = $facts['os_service_default'], $allowed_source_ranges = $facts['os_service_default'],
$disable_by_file_path = $facts['os_service_default'], $ignore_proxied_requests = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'], $disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'],
) { ) {
include mistral::deps include mistral::deps
@ -48,10 +53,11 @@ class mistral::healthcheck (
} }
oslo::healthcheck { 'mistral_config': oslo::healthcheck { 'mistral_config':
detailed => $detailed, detailed => $detailed,
backends => $backends, backends => $backends,
allowed_source_ranges => $allowed_source_ranges, allowed_source_ranges => $allowed_source_ranges,
disable_by_file_path => $disable_by_file_path, ignore_proxied_requests => $ignore_proxied_requests,
disable_by_file_paths => $disable_by_file_paths, disable_by_file_path => $disable_by_file_path,
disable_by_file_paths => $disable_by_file_paths,
} }
} }

5
releasenotes/notes/healthcheck-ignore_proxied_requests-a52d17b5c7ca1818.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``mistral::healthcheck::ignore_proxied_requests`` parameter has
been added.

35
spec/classes/mistral_healthcheck_spec.rb
View File

@ -13,11 +13,12 @@ describe 'mistral::healthcheck' do
is_expected.to contain_mistral_config('healthcheck/enabled').with_value('<SERVICE DEFAULT>') is_expected.to contain_mistral_config('healthcheck/enabled').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__healthcheck('mistral_config').with( is_expected.to contain_oslo__healthcheck('mistral_config').with(
:detailed => '<SERVICE DEFAULT>', :detailed => '<SERVICE DEFAULT>',
:backends => '<SERVICE DEFAULT>', :backends => '<SERVICE DEFAULT>',
:allowed_source_ranges => '<SERVICE DEFAULT>', :allowed_source_ranges => '<SERVICE DEFAULT>',
:disable_by_file_path => '<SERVICE DEFAULT>', :ignore_proxied_requests => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>', :disable_by_file_path => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>',
) )
end end
end end
@ -25,12 +26,13 @@ describe 'mistral::healthcheck' do
context 'with specific parameters' do context 'with specific parameters' do
let :params do let :params do
{ {
:enabled => true, :enabled => true,
:detailed => true, :detailed => true,
:backends => ['disable_by_file'], :backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'], :allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:disable_by_file_path => '/etc/mistral/healthcheck/disabled', :ignore_proxied_requests => false,
:disable_by_file_paths => ['8989:/etc/mistral/healthcheck/disabled'], :disable_by_file_path => '/etc/mistral/healthcheck/disabled',
:disable_by_file_paths => ['8989:/etc/mistral/healthcheck/disabled'],
} }
end end
@ -38,11 +40,12 @@ describe 'mistral::healthcheck' do
is_expected.to contain_mistral_config('healthcheck/enabled').with_value(true) is_expected.to contain_mistral_config('healthcheck/enabled').with_value(true)
is_expected.to contain_oslo__healthcheck('mistral_config').with( is_expected.to contain_oslo__healthcheck('mistral_config').with(
:detailed => true, :detailed => true,
:backends => ['disable_by_file'], :backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'], :allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:disable_by_file_path => '/etc/mistral/healthcheck/disabled', :ignore_proxied_requests => false,
:disable_by_file_paths => ['8989:/etc/mistral/healthcheck/disabled'], :disable_by_file_path => '/etc/mistral/healthcheck/disabled',
:disable_by_file_paths => ['8989:/etc/mistral/healthcheck/disabled'],
) )
end end
end end