Merge "Add support for healthcheck middleware options"
This commit is contained in:
commit
3c0b8b5fe2
41
manifests/healthcheck.pp
Normal file
41
manifests/healthcheck.pp
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
# == Class: magnum::healthcheck
|
||||||
|
#
|
||||||
|
# Configure oslo_middleware options in healthcheck section
|
||||||
|
#
|
||||||
|
# == Params
|
||||||
|
#
|
||||||
|
# [*detailed*]
|
||||||
|
# (Optional) Show more detailed information as part of the response.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
|
# [*backends*]
|
||||||
|
# (Optional) Additional backends that can perform health checks and report
|
||||||
|
# that information back as part of a request.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
|
# [*disable_by_file_path*]
|
||||||
|
# (Optional) Check the presense of a file to determine if an application
|
||||||
|
# is running on a port.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
|
# [*disable_by_file_paths*]
|
||||||
|
# (Optional) Check the presense of a file to determine if an application
|
||||||
|
# is running on a port. Expects a "port:path" list of strings.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
|
class magnum::healthcheck (
|
||||||
|
$detailed = $::os_service_default,
|
||||||
|
$backends = $::os_service_default,
|
||||||
|
$disable_by_file_path = $::os_service_default,
|
||||||
|
$disable_by_file_paths = $::os_service_default,
|
||||||
|
) {
|
||||||
|
|
||||||
|
include magnum::deps
|
||||||
|
|
||||||
|
oslo::healthcheck { 'magnum_config':
|
||||||
|
detailed => $detailed,
|
||||||
|
backends => $backends,
|
||||||
|
disable_by_file_path => $disable_by_file_path,
|
||||||
|
disable_by_file_paths => $disable_by_file_paths,
|
||||||
|
}
|
||||||
|
}
|
5
releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml
Normal file
5
releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``magnum::healthcheck`` class has been added. This class manages
|
||||||
|
parameters of healthcheck middlware in oslo.middleware.
|
55
spec/classes/magnum_healthcheck_spec.rb
Normal file
55
spec/classes/magnum_healthcheck_spec.rb
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe 'magnum::healthcheck' do
|
||||||
|
|
||||||
|
shared_examples_for 'magnum::healthcheck' do
|
||||||
|
|
||||||
|
context 'with default parameters' do
|
||||||
|
let :params do
|
||||||
|
{}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'configures default values' do
|
||||||
|
is_expected.to contain_oslo__healthcheck('magnum_config').with(
|
||||||
|
:detailed => '<SERVICE DEFAULT>',
|
||||||
|
:backends => '<SERVICE DEFAULT>',
|
||||||
|
:disable_by_file_path => '<SERVICE DEFAULT>',
|
||||||
|
:disable_by_file_paths => '<SERVICE DEFAULT>',
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with specific parameters' do
|
||||||
|
let :params do
|
||||||
|
{
|
||||||
|
:detailed => true,
|
||||||
|
:backends => ['disable_by_file'],
|
||||||
|
:disable_by_file_path => '/etc/magnum/healthcheck/disabled',
|
||||||
|
:disable_by_file_paths => ['9511:/etc/magnum/healthcheck/disabled'],
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'configures specified values' do
|
||||||
|
is_expected.to contain_oslo__healthcheck('magnum_config').with(
|
||||||
|
:detailed => true,
|
||||||
|
:backends => ['disable_by_file'],
|
||||||
|
:disable_by_file_path => '/etc/magnum/healthcheck/disabled',
|
||||||
|
:disable_by_file_paths => ['9511:/etc/magnum/healthcheck/disabled'],
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
on_supported_os({
|
||||||
|
:supported_os => OSDefaults.get_supported_os
|
||||||
|
}).each do |os,facts|
|
||||||
|
context "on #{os}" do
|
||||||
|
let (:facts) do
|
||||||
|
facts.merge!(OSDefaults.get_facts())
|
||||||
|
end
|
||||||
|
|
||||||
|
it_configures 'magnum::healthcheck'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user