inspector: Fix missing healthcheck options
... to sync the healthceck class for ironic-inspector with the one for ironic. Change-Id: I8a560d2a91f518e94dbfcce0eb8338b1348e3b16
This commit is contained in:
@@ -17,6 +17,15 @@
|
|||||||
# 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']
|
||||||
|
#
|
||||||
|
# [*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.
|
||||||
@@ -31,6 +40,8 @@ class ironic::inspector::healthcheck (
|
|||||||
$enabled = $facts['os_service_default'],
|
$enabled = $facts['os_service_default'],
|
||||||
$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'],
|
||||||
|
$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'],
|
||||||
) {
|
) {
|
||||||
@@ -44,6 +55,8 @@ class ironic::inspector::healthcheck (
|
|||||||
oslo::healthcheck { 'ironic_inspector_config':
|
oslo::healthcheck { 'ironic_inspector_config':
|
||||||
detailed => $detailed,
|
detailed => $detailed,
|
||||||
backends => $backends,
|
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_path => $disable_by_file_path,
|
||||||
disable_by_file_paths => $disable_by_file_paths,
|
disable_by_file_paths => $disable_by_file_paths,
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The following parameters have been added to
|
||||||
|
the ``ironic::inspector::healthcheck`` class.
|
||||||
|
|
||||||
|
- ``allowed_source_ranges``
|
||||||
|
- ``ignore_proxied_requests``
|
@@ -15,6 +15,8 @@ describe 'ironic::inspector::healthcheck' do
|
|||||||
is_expected.to contain_oslo__healthcheck('ironic_inspector_config').with(
|
is_expected.to contain_oslo__healthcheck('ironic_inspector_config').with(
|
||||||
:detailed => '<SERVICE DEFAULT>',
|
:detailed => '<SERVICE DEFAULT>',
|
||||||
:backends => '<SERVICE DEFAULT>',
|
:backends => '<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>',
|
||||||
)
|
)
|
||||||
@@ -27,6 +29,8 @@ describe 'ironic::inspector::healthcheck' do
|
|||||||
:enabled => true,
|
:enabled => true,
|
||||||
: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'],
|
||||||
|
:ignore_proxied_requests => false,
|
||||||
:disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled',
|
:disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled',
|
||||||
:disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'],
|
:disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'],
|
||||||
}
|
}
|
||||||
@@ -38,6 +42,8 @@ describe 'ironic::inspector::healthcheck' do
|
|||||||
is_expected.to contain_oslo__healthcheck('ironic_inspector_config').with(
|
is_expected.to contain_oslo__healthcheck('ironic_inspector_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'],
|
||||||
|
:ignore_proxied_requests => false,
|
||||||
:disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled',
|
:disable_by_file_path => '/etc/ironic-inspector/healthcheck/disabled',
|
||||||
:disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'],
|
:disable_by_file_paths => ['5050:/etc/ironic-inspector/healthcheck/disabled'],
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user