Merge "Add support for [service:central] scheduler_filters"

This commit is contained in:
Zuul 2021-11-17 09:47:16 +00:00 committed by Gerrit Code Review
commit e44cdcb34f
3 changed files with 14 additions and 0 deletions

View File

@ -53,6 +53,10 @@
# (optional) The name of the default pool.
# Defaults to $::os_service_default
#
# [*scheduler_filters*]
# (optional) Enabled pool scheduling filters.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*max_domain_name_len*]
@ -72,6 +76,7 @@ class designate::central (
$workers = $::os_workers,
$threads = $::os_service_default,
$default_pool_id = $::os_service_default,
$scheduler_filters = $::os_service_default,
# DEPRECATED PARAMETERS
$max_domain_name_len = undef,
) inherits designate {
@ -88,6 +93,7 @@ class designate::central (
'service:central/workers' : value => $workers;
'service:central/threads' : value => $threads;
'service:central/default_pool_id' : value => $default_pool_id;
'service:central/scheduler_filters' : value => join(any2array($scheduler_filters), ',');
}
# TODO(tkajinam): Remove this when the max_domain_name_len parameter

View File

@ -0,0 +1,5 @@
---
features:
- |
Support for the ``[service:central] scheduler_filters`` parameter has been
added.

View File

@ -39,6 +39,7 @@ describe 'designate::central' do
is_expected.to contain_designate_config('service:central/workers').with_value(8)
is_expected.to contain_designate_config('service:central/threads').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:central/default_pool_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:central/scheduler_filters').with_value('<SERVICE DEFAULT>')
end
end
@ -47,12 +48,14 @@ describe 'designate::central' do
params.merge!({
:max_zone_name_len => 100,
:max_recordset_name_len => 200,
:scheduler_filters => 'default_pool',
})
end
it 'configures the values set' do
is_expected.to contain_designate_config('service:central/max_zone_name_len').with_value(100)
is_expected.to contain_designate_config('service:central/max_recordset_name_len').with_value(200)
is_expected.to contain_designate_config('service:central/scheduler_filters').with_value('default_pool')
end
end