Merge "api: Remove redundant default values"

This commit is contained in:
Zuul 2022-06-28 14:37:55 +00:00 committed by Gerrit Code Review
commit 8b7be73088
2 changed files with 12 additions and 12 deletions

View File

@ -31,15 +31,15 @@
#
# [*bind_host*]
# (optional) The address of the host to bind to.
# Default: 0.0.0.0
# Default: $::os_service_default
#
# [*bind_port*]
# (optional) The port the server should bind to.
# Default: 8779
# Default: $::os_service_default
#
# [*backlog*]
# (optional) Backlog requests when creating socket
# Default: 4096
# Default: $::os_service_default
#
# [*workers*]
# (optional) Number of trove API worker processes to start
@ -92,12 +92,12 @@
#
# [*taskmanager_queue*]
# (optional) Message queue name the Taskmanager will listen to.
# Defaults to 'taskmanager'.
# Defaults to $::os_service_default.
#
class trove::api(
$bind_host = '0.0.0.0',
$bind_port = '8779',
$backlog = '4096',
$bind_host = $::os_service_default,
$bind_port = $::os_service_default,
$backlog = $::os_service_default,
$workers = $::os_workers,
$enabled = true,
$purge_config = false,
@ -112,7 +112,7 @@ class trove::api(
$manage_service = true,
$package_ensure = 'present',
$auth_strategy = 'keystone',
$taskmanager_queue = 'taskmanager',
$taskmanager_queue = $::os_service_default,
) {
include trove::deps

View File

@ -63,16 +63,16 @@ describe 'trove::api' do
end
it 'configures trove-api with default parameters' do
is_expected.to contain_trove_config('DEFAULT/bind_host').with_value('0.0.0.0')
is_expected.to contain_trove_config('DEFAULT/bind_port').with_value('8779')
is_expected.to contain_trove_config('DEFAULT/backlog').with_value('4096')
is_expected.to contain_trove_config('DEFAULT/bind_host').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/bind_port').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/backlog').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/trove_api_workers').with_value('8')
is_expected.to contain_trove_config('DEFAULT/http_get_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_post_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_put_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_delete_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_mgmt_post_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('taskmanager')
is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('ssl/cert_file').with_ensure('absent')
is_expected.to contain_trove_config('ssl/key_file').with_ensure('absent')
is_expected.to contain_trove_config('ssl/ca_file').with_ensure('absent')