From cea3a570463461e7d236d50e64a0712950ff5ba6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 12 Jul 2021 11:34:58 +0900 Subject: [PATCH] Add support for healthcheck middleware options Depends-on: https://review.opendev.org/772202 Change-Id: I372ccbc835bc740113936b46ce84ab5e7e341107 --- manifests/healthcheck.pp | 41 ++++++++++++++ .../notes/healthcheck-2f8b3923afae18e7.yaml | 5 ++ spec/classes/magnum_healthcheck_spec.rb | 55 +++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 manifests/healthcheck.pp create mode 100644 releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml create mode 100644 spec/classes/magnum_healthcheck_spec.rb diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp new file mode 100644 index 0000000..301164d --- /dev/null +++ b/manifests/healthcheck.pp @@ -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, + } +} diff --git a/releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml b/releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml new file mode 100644 index 0000000..30c2741 --- /dev/null +++ b/releasenotes/notes/healthcheck-2f8b3923afae18e7.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``magnum::healthcheck`` class has been added. This class manages + parameters of healthcheck middlware in oslo.middleware. diff --git a/spec/classes/magnum_healthcheck_spec.rb b/spec/classes/magnum_healthcheck_spec.rb new file mode 100644 index 0000000..ed68ecf --- /dev/null +++ b/spec/classes/magnum_healthcheck_spec.rb @@ -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 => '', + :backends => '', + :disable_by_file_path => '', + :disable_by_file_paths => '', + ) + 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