openstack/puppet-glance
Code Issues Proposed changes

healthcheck: Expose ignore_proxied_requests parameter

Browse Source 
Depends-on: https://review.opendev.org/909807
Change-Id: Ia7d4a2ff0d229b3c6c5107e0fff22ef20977bc37
This commit is contained in:
Takashi Kajinami
2024-02-26 01:25:04 +09:00
parent 0dcda53bb3
commit ff0dae837e
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/healthcheck.pp
View File

@@ -18,6 +18,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 presence of a file to determine if an application # (Optional) Check the presence of a file to determine if an application
# is running on a port. # is running on a port.
@@ -29,20 +33,22 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class glance::healthcheck ( class glance::healthcheck (
$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 glance::deps include glance::deps
oslo::healthcheck { 'glance_api_config': oslo::healthcheck { 'glance_api_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-b0b067f03f72a35d.yaml Normal file
View File

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

33
spec/classes/glance_healthcheck_spec.rb
View File

@@ -11,11 +11,12 @@ describe 'glance::healthcheck' do
it 'configures default values' do it 'configures default values' do
is_expected.to contain_oslo__healthcheck('glance_api_config').with( is_expected.to contain_oslo__healthcheck('glance_api_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
@@ -23,21 +24,23 @@ describe 'glance::healthcheck' do
context 'with specific parameters' do context 'with specific parameters' do
let :params do let :params do
{ {
: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/glance/healthcheck/disabled', :ignore_proxied_requests => false,
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'], :disable_by_file_path => '/etc/glance/healthcheck/disabled',
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
} }
end end
it 'configures specified values' do it 'configures specified values' do
is_expected.to contain_oslo__healthcheck('glance_api_config').with( is_expected.to contain_oslo__healthcheck('glance_api_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/glance/healthcheck/disabled', :ignore_proxied_requests => false,
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'], :disable_by_file_path => '/etc/glance/healthcheck/disabled',
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
) )
end end
end end