Browse Source

Merge "Add support for healthcheck middleware options"

changes/66/788666/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
7fb4f8fe68
3 changed files with 101 additions and 0 deletions
  1. +41
    -0
      manifests/healthcheck.pp
  2. +5
    -0
      releasenotes/notes/healthcheck-0e927c75e81b8b5c.yaml
  3. +55
    -0
      spec/classes/neutron_healthcheck_spec.rb

+ 41
- 0
manifests/healthcheck.pp View File

@ -0,0 +1,41 @@
# == Class: neutron::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 neutron::healthcheck (
$detailed = $::os_service_default,
$backends = $::os_service_default,
$disable_by_file_path = $::os_service_default,
$disable_by_file_paths = $::os_service_default,
) {
include neutron::deps
oslo::healthcheck { 'neutron_config':
detailed => $detailed,
backends => $backends,
disable_by_file_path => $disable_by_file_path,
disable_by_file_paths => $disable_by_file_paths,
}
}

+ 5
- 0
releasenotes/notes/healthcheck-0e927c75e81b8b5c.yaml View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``neutron::healthcheck`` class has been added. This class manages
parameters of healthcheck middlware in oslo.middleware.

+ 55
- 0
spec/classes/neutron_healthcheck_spec.rb View File

@ -0,0 +1,55 @@
require 'spec_helper'
describe 'neutron::healthcheck' do
shared_examples_for 'neutron::healthcheck' do
context 'with default parameters' do
let :params do
{}
end
it 'configures default values' do
is_expected.to contain_oslo__healthcheck('neutron_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/neutron/healthcheck/disabled',
:disable_by_file_paths => ['9696:/etc/neutron/healthcheck/disabled'],
}
end
it 'configures specified values' do
is_expected.to contain_oslo__healthcheck('neutron_config').with(
:detailed => true,
:backends => ['disable_by_file'],
:disable_by_file_path => '/etc/neutron/healthcheck/disabled',
:disable_by_file_paths => ['9696:/etc/neutron/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 'neutron::healthcheck'
end
end
end

Loading…
Cancel
Save