healthcheck: Expose allowed_source_ranges
... which was added to puppet-oslo recently. Depends-on: https://review.opendev.org/905557 Change-Id: Ia9b0534f4e4a6b0d2325ccef318f35ef3789eb08
This commit is contained in:
parent
6c6c3011a8
commit
4bf6dd0f4b
|
@ -1,4 +1,4 @@
|
||||||
# == Define: cloudkitty::healthcheck
|
# == Class: cloudkitty::healthcheck
|
||||||
#
|
#
|
||||||
# Configure oslo_middleware options in healthcheck section
|
# Configure oslo_middleware options in healthcheck section
|
||||||
#
|
#
|
||||||
|
@ -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 cloudkitty::healthcheck (
|
class cloudkitty::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 cloudkitty::healthcheck (
|
||||||
oslo::healthcheck { 'cloudkitty_config':
|
oslo::healthcheck { 'cloudkitty_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,
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``cloudkitty::healthcheck::allowed_source_ranges`` parameter has
|
||||||
|
been added.
|
|
@ -13,6 +13,7 @@ describe 'cloudkitty::healthcheck' do
|
||||||
is_expected.to contain_oslo__healthcheck('cloudkitty_config').with(
|
is_expected.to contain_oslo__healthcheck('cloudkitty_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 'cloudkitty::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/cloudkitty/healthcheck/disabled',
|
:disable_by_file_path => '/etc/cloudkitty/healthcheck/disabled',
|
||||||
:disable_by_file_paths => ['8889:/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(
|
is_expected.to contain_oslo__healthcheck('cloudkitty_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/cloudkitty/healthcheck/disabled',
|
:disable_by_file_path => '/etc/cloudkitty/healthcheck/disabled',
|
||||||
:disable_by_file_paths => ['8889:/etc/cloudkitty/healthcheck/disabled'],
|
:disable_by_file_paths => ['8889:/etc/cloudkitty/healthcheck/disabled'],
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue