openstack/puppet-ironic
Code Issues Proposed changes

Merge "healthcheck: Expose ignore_proxied_requests parameter"

Browse Source
This commit is contained in:
Zuul
2024-02-26 03:10:03 +00:00
committed by Gerrit Code Review
parent b660819456 875efc2990
commit 76b07c7bda
3 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 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.
@@ -37,6 +41,7 @@ class ironic::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'],
$ignore_proxied_requests = $facts['os_service_default'],
$disable_by_file_path = $facts['os_service_default'], $disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'], $disable_by_file_paths = $facts['os_service_default'],
) { ) {
@@ -51,6 +56,7 @@ class ironic::healthcheck (
detailed => $detailed, detailed => $detailed,
backends => $backends, backends => $backends,
allowed_source_ranges => $allowed_source_ranges, allowed_source_ranges => $allowed_source_ranges,
ignore_proxied_requests => $ignore_proxied_requests,
disable_by_file_path => $disable_by_file_path, disable_by_file_path => $disable_by_file_path,
disable_by_file_paths => $disable_by_file_paths, disable_by_file_paths => $disable_by_file_paths,
} }

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

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

3
spec/classes/ironic_healthcheck_spec.rb
View File

@@ -16,6 +16,7 @@ describe 'ironic::healthcheck' do
:detailed => '<SERVICE DEFAULT>', :detailed => '<SERVICE DEFAULT>',
:backends => '<SERVICE DEFAULT>', :backends => '<SERVICE DEFAULT>',
:allowed_source_ranges => '<SERVICE DEFAULT>', :allowed_source_ranges => '<SERVICE DEFAULT>',
:ignore_proxied_requests => '<SERVICE DEFAULT>',
:disable_by_file_path => '<SERVICE DEFAULT>', :disable_by_file_path => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>', :disable_by_file_paths => '<SERVICE DEFAULT>',
) )
@@ -29,6 +30,7 @@ describe 'ironic::healthcheck' 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'],
:ignore_proxied_requests => false,
:disable_by_file_path => '/etc/ironic/healthcheck/disabled', :disable_by_file_path => '/etc/ironic/healthcheck/disabled',
:disable_by_file_paths => ['8042:/etc/ironic/healthcheck/disabled'], :disable_by_file_paths => ['8042:/etc/ironic/healthcheck/disabled'],
} }
@@ -41,6 +43,7 @@ describe 'ironic::healthcheck' 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'],
:ignore_proxied_requests => false,
:disable_by_file_path => '/etc/ironic/healthcheck/disabled', :disable_by_file_path => '/etc/ironic/healthcheck/disabled',
:disable_by_file_paths => ['8042:/etc/ironic/healthcheck/disabled'], :disable_by_file_paths => ['8042:/etc/ironic/healthcheck/disabled'],
) )