openstack/puppet-swift
Code Issues Proposed changes

Merge "proxy: Reduce hard-coded default values"

Browse Source
This commit is contained in:
Zuul
2022-08-01 09:09:08 +00:00
committed by Gerrit Code Review
parent 44fdeb5f11 77e850340c
commit effad6c4a7
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/proxy.pp
View File

@@ -64,16 +64,16 @@
# Defaults to 'LOG_LOCAL2'.
#
# [*log_handoffs*]
# (optional) If True, the proxy will log whenever it has to failover to a handoff node
# Defaults to true.
# (optional) If True, the proxy will log whenever it has to failover to a handoff node
# Defaults to $::os_service_default.
#
# [*object_chunk_size*]
# (optional) Chunk size to read from object servers.
# Default to 65536.
# (optional) Chunk size to read from object servers.
# Defaults to $::os_service_default.
#
# [*client_chunk_size*]
# (optional) Chunk size to read from clients.
# Default to 65536.
# (optional) Chunk size to read from clients.
# Defaults to $::os_service_default.
#
# [*max_containers_per_account*]
# (optional) If set to a positive value, will limit container number per account.
@@ -170,13 +170,13 @@ class swift::proxy(
$log_address = '/dev/log',
$log_level = 'INFO',
$log_facility = 'LOG_LOCAL2',
$log_handoffs = true,
$log_handoffs = $::os_service_default,
$log_name = 'proxy-server',
$cors_allow_origin = undef,
$strict_cors_mode = true,
$object_chunk_size = 65536,
$client_chunk_size = 65536,
$max_containers_per_account = 0,
$object_chunk_size = $::os_service_default,
$client_chunk_size = $::os_service_default,
$max_containers_per_account = $::os_service_default,
$max_containers_whitelist = $::os_service_default,
$read_affinity = undef,
$write_affinity = undef,

11
spec/classes/swift_proxy_spec.rb
View File

@@ -69,12 +69,12 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2') }
it { should contain_swift_proxy_config('app:proxy-server/set log_level').with_value('INFO') }
it { should contain_swift_proxy_config('app:proxy-server/set log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('true') }
it { should contain_swift_proxy_config('app:proxy-server/object_chunk_size').with_value('65536') }
it { should contain_swift_proxy_config('app:proxy-server/client_chunk_size').with_value('65536') }
it { should contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/object_chunk_size').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/client_chunk_size').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/allow_account_management').with_value('true') }
it { should contain_swift_proxy_config('app:proxy-server/account_autocreate').with_value('true') }
it { should contain_swift_proxy_config('app:proxy-server/max_containers_per_account').with_value(0) }
it { should contain_swift_proxy_config('app:proxy-server/max_containers_per_account').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/max_containers_whitelist').with_value('<SERVICE DEFAULT>') }
it { should contain_service('swift-proxy-server').with_require([
@@ -158,7 +158,7 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2') }
it { should contain_swift_proxy_config('app:proxy-server/set log_level').with_value('DEBUG') }
it { should contain_swift_proxy_config('app:proxy-server/set log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('true') }
it { should contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/object_chunk_size').with_value('8192') }
it { should contain_swift_proxy_config('app:proxy-server/client_chunk_size').with_value('8192') }
it { should contain_swift_proxy_config('app:proxy-server/allow_account_management').with_value('false') }
@@ -211,6 +211,7 @@ describe 'swift::proxy' do
:log_name => 'swift-proxy-server',
:log_udp_host => '127.0.0.1',
:log_udp_port => '514',
:log_handoffs => true,
:read_affinity => 'r1z1=100, r1=200',
:write_affinity => 'r1',
:write_affinity_node_count => '2 * replicas',