openstack/puppet-glance
Code Issues Proposed changes

Merge "healthcheck: Expose allowed_source_ranges"

Browse Source
This commit is contained in:
Zuul 2024-01-17 16:13:21 +00:00 committed by Gerrit Code Review
commit 23d579d515
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/healthcheck.pp
View File

@ -13,6 +13,11 @@
# that information back as part of a request. # that information back as part of a request.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*allowed_source_ranges*]
# (Optional) A list of network addresses to limit source ip allowed to access
# healthcheck information.
# 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.
@ -26,6 +31,7 @@
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'],
$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'],
) { ) {
@ -35,6 +41,7 @@ class glance::healthcheck (
oslo::healthcheck { 'glance_api_config': oslo::healthcheck { 'glance_api_config':
detailed => $detailed, detailed => $detailed,
backends => $backends, backends => $backends,
allowed_source_ranges => $allowed_source_ranges,
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-allowed_source_ranges-9ddd09715e0a9c09.yaml Normal file
View File

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

3
spec/classes/glance_healthcheck_spec.rb
View File

@ -13,6 +13,7 @@ describe 'glance::healthcheck' 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>',
:disable_by_file_path => '<SERVICE DEFAULT>', :disable_by_file_path => '<SERVICE DEFAULT>',
:disable_by_file_paths => '<SERVICE DEFAULT>', :disable_by_file_paths => '<SERVICE DEFAULT>',
) )
@ -24,6 +25,7 @@ describe 'glance::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'],
:disable_by_file_path => '/etc/glance/healthcheck/disabled', :disable_by_file_path => '/etc/glance/healthcheck/disabled',
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'], :disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
} }
@ -33,6 +35,7 @@ describe 'glance::healthcheck' 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'],
:disable_by_file_path => '/etc/glance/healthcheck/disabled', :disable_by_file_path => '/etc/glance/healthcheck/disabled',
:disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'], :disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
) )