diff --git a/manifests/inspector/healthcheck.pp b/manifests/inspector/healthcheck.pp index 8bb6ddec..51af8391 100644 --- a/manifests/inspector/healthcheck.pp +++ b/manifests/inspector/healthcheck.pp @@ -17,6 +17,15 @@ # 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'] +# +# [*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. @@ -28,11 +37,13 @@ # Defaults to $facts['os_service_default'] # class ironic::inspector::healthcheck ( - $enabled = $facts['os_service_default'], - $detailed = $facts['os_service_default'], - $backends = $facts['os_service_default'], - $disable_by_file_path = $facts['os_service_default'], - $disable_by_file_paths = $facts['os_service_default'], + $enabled = $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 ironic::deps @@ -42,9 +53,11 @@ class ironic::inspector::healthcheck ( } oslo::healthcheck { 'ironic_inspector_config': - detailed => $detailed, - backends => $backends, - 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, } } diff --git a/releasenotes/notes/inspector-hc-opts-baf1502472944600.yaml b/releasenotes/notes/inspector-hc-opts-baf1502472944600.yaml new file mode 100644 index 00000000..e56ad14c --- /dev/null +++ b/releasenotes/notes/inspector-hc-opts-baf1502472944600.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The following parameters have been added to + the ``ironic::inspector::healthcheck`` class. + + - ``allowed_source_ranges`` + - ``ignore_proxied_requests`` diff --git a/spec/classes/ironic_inspector_healthcheck_spec.rb b/spec/classes/ironic_inspector_healthcheck_spec.rb index 033a5f74..d2fb0c25 100644 --- a/spec/classes/ironic_inspector_healthcheck_spec.rb +++ b/spec/classes/ironic_inspector_healthcheck_spec.rb @@ -13,10 +13,12 @@ describe 'ironic::inspector::healthcheck' do is_expected.to contain_ironic_inspector_config('healthcheck/enabled').with_value('') is_expected.to contain_oslo__healthcheck('ironic_inspector_config').with( - :detailed => '', - :backends => '', - :disable_by_file_path => '', - :disable_by_file_paths => '', + :detailed => '', + :backends => '', + :allowed_source_ranges => '', + :ignore_proxied_requests => '', + :disable_by_file_path => '', + :disable_by_file_paths => '', ) end end @@ -24,11 +26,13 @@ describe 'ironic::inspector::healthcheck' do context 'with specific parameters' do let :params do { - :enabled => true, - :detailed => true, - :backends => ['disable_by_file'], - :disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled', - :disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'], + :enabled => true, + :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/ironic-inspector/healthcheck/disabled', + :disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'], } end @@ -36,10 +40,12 @@ describe 'ironic::inspector::healthcheck' do is_expected.to contain_ironic_inspector_config('healthcheck/enabled').with_value(true) is_expected.to contain_oslo__healthcheck('ironic_inspector_config').with( - :detailed => true, - :backends => ['disable_by_file'], - :disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled', - :disable_by_file_paths => ['5050:/etc/ironic-inspector/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/ironic-inspector/healthcheck/disabled', + :disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'], ) end end