From 4bf6dd0f4b988ea19f8798b281c33199ca1e44d1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 17 Jan 2024 02:52:55 +0900 Subject: [PATCH] healthcheck: Expose allowed_source_ranges ... which was added to puppet-oslo recently. Depends-on: https://review.opendev.org/905557 Change-Id: Ia9b0534f4e4a6b0d2325ccef318f35ef3789eb08 --- manifests/healthcheck.pp | 9 ++++++++- ...althcheck-allowed_source_ranges-092c9dc431137ecc.yaml | 5 +++++ spec/classes/cloudkitty_healthcheck_spec.rb | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/healthcheck-allowed_source_ranges-092c9dc431137ecc.yaml diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index c8721e8..d4b9078 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -1,4 +1,4 @@ -# == Define: cloudkitty::healthcheck +# == Class: cloudkitty::healthcheck # # Configure oslo_middleware options in healthcheck section # @@ -13,6 +13,11 @@ # that information back as part of a request. # 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*] # (Optional) Check the presence of a file to determine if an application # is running on a port. @@ -26,6 +31,7 @@ class cloudkitty::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'], ) { @@ -35,6 +41,7 @@ class cloudkitty::healthcheck ( oslo::healthcheck { 'cloudkitty_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, } diff --git a/releasenotes/notes/healthcheck-allowed_source_ranges-092c9dc431137ecc.yaml b/releasenotes/notes/healthcheck-allowed_source_ranges-092c9dc431137ecc.yaml new file mode 100644 index 0000000..0b156f9 --- /dev/null +++ b/releasenotes/notes/healthcheck-allowed_source_ranges-092c9dc431137ecc.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``cloudkitty::healthcheck::allowed_source_ranges`` parameter has + been added. diff --git a/spec/classes/cloudkitty_healthcheck_spec.rb b/spec/classes/cloudkitty_healthcheck_spec.rb index f9ad92f..22f6835 100644 --- a/spec/classes/cloudkitty_healthcheck_spec.rb +++ b/spec/classes/cloudkitty_healthcheck_spec.rb @@ -13,6 +13,7 @@ describe 'cloudkitty::healthcheck' do is_expected.to contain_oslo__healthcheck('cloudkitty_config').with( :detailed => '', :backends => '', + :allowed_source_ranges => '', :disable_by_file_path => '', :disable_by_file_paths => '', ) @@ -24,6 +25,7 @@ describe 'cloudkitty::healthcheck' 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/cloudkitty/healthcheck/disabled', :disable_by_file_paths => ['8889:/etc/cloudkitty/healthcheck/disabled'], } @@ -33,6 +35,7 @@ describe 'cloudkitty::healthcheck' do is_expected.to contain_oslo__healthcheck('cloudkitty_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/cloudkitty/healthcheck/disabled', :disable_by_file_paths => ['8889:/etc/cloudkitty/healthcheck/disabled'], )