openstack
/
puppet-barbican
Code Issues Proposed changes

healthcheck: Expose ignore_proxied_requests parameter 

Depends-on: https://review.opendev.org/909807
Change-Id: Id5c5cb90a50983357d0c8001eedefedb3fd60f4d
This commit is contained in:
Takashi Kajinami 2024-02-22 11:27:11 +09:00
parent ce4ec934ef
commit 276812bec6
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/healthcheck.pp
View File

@ -18,6 +18,10 @@
# healthcheck information.
# 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*]
# (Optional) Check the presence of a file to determine if an application
# is running on a port.
@ -29,20 +33,22 @@
# Defaults to $facts['os_service_default']
#
class barbican::healthcheck (
$detailed = $facts['os_service_default'],
$backends = $facts['os_service_default'],
$allowed_source_ranges = $facts['os_service_default'],
$disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'],
$detailed = $facts['os_service_default'],
$backends = $facts['os_service_default'],
$allowed_source_ranges = $facts['os_service_default'],
$ignore_proxied_requests = $facts['os_service_default'],
$disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'],
) {
include barbican::deps
oslo::healthcheck { 'barbican_config':
detailed => $detailed,
backends => $backends,
allowed_source_ranges => $allowed_source_ranges,
disable_by_file_path => $disable_by_file_path,
disable_by_file_paths => $disable_by_file_paths,
detailed => $detailed,
backends => $backends,
allowed_source_ranges => $allowed_source_ranges,
ignore_proxied_requests => $ignore_proxied_requests,
disable_by_file_path => $disable_by_file_path,
disable_by_file_paths => $disable_by_file_paths,
}
}

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

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

33
spec/classes/barbican_healthcheck_spec.rb
View File

@ -11,11 +11,12 @@ describe 'barbican::healthcheck' do
it 'configures default values' do
is_expected.to contain_oslo__healthcheck('barbican_config').with(
:detailed => '<SERVICE DEFAULT>',
:backends => '<SERVICE DEFAULT>',
:allowed_source_ranges => '<SERVICE DEFAULT>',
:disable_by_file_path => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>',
:detailed => '<SERVICE DEFAULT>',
:backends => '<SERVICE DEFAULT>',
:allowed_source_ranges => '<SERVICE DEFAULT>',
:ignore_proxied_requests => '<SERVICE DEFAULT>',
:disable_by_file_path => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>',
)
end
end
@ -23,21 +24,23 @@ describe 'barbican::healthcheck' do
context 'with specific parameters' do
let :params do
{
:detailed => true,
:backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:disable_by_file_path => '/etc/barbican/healthcheck/disabled',
:disable_by_file_paths => ['9311:/etc/barbican/healthcheck/disabled'],
:detailed => true,
:backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:ignore_proxied_requests => false,
:disable_by_file_path => '/etc/barbican/healthcheck/disabled',
:disable_by_file_paths => ['9311:/etc/barbican/healthcheck/disabled'],
}
end
it 'configures specified values' do
is_expected.to contain_oslo__healthcheck('barbican_config').with(
:detailed => true,
:backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:disable_by_file_path => '/etc/barbican/healthcheck/disabled',
:disable_by_file_paths => ['9311:/etc/barbican/healthcheck/disabled'],
:detailed => true,
:backends => ['disable_by_file'],
:allowed_source_ranges => ['10.0.0.0/24', '10.0.1.0/24'],
:ignore_proxied_requests => false,
:disable_by_file_path => '/etc/barbican/healthcheck/disabled',
:disable_by_file_paths => ['9311:/etc/barbican/healthcheck/disabled'],
)
end
end