openstack/puppet-swift
Code Issues Proposed changes

Merge "Use $::os_service_default instead of undef"

Browse Source
This commit is contained in:
Zuul
2022-08-01 09:09:17 +00:00
committed by Gerrit Code Review
parent effad6c4a7 93b2eb187e
commit 1a92de5c89
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/proxy.pp
View File

@@ -94,19 +94,19 @@
# [*write_affinity_node_count*] # [*write_affinity_node_count*]
# (optional) Configures write_affinity_node_count for proxy-server. # (optional) Configures write_affinity_node_count for proxy-server.
# Optional but requires write_affinity to be set. # Optional but requires write_affinity to be set.
# Defaults to undef. # Defaults to $::os_service_default.
# #
# [*client_timeout*] # [*client_timeout*]
# (optional) Configures client_timeout for swift proxy-server. # (optional) Configures client_timeout for swift proxy-server.
# Defaults to undef. # Defaults to $::os_service_default.
# #
# [*node_timeout*] # [*node_timeout*]
# (optional) Configures node_timeout for swift proxy-server # (optional) Configures node_timeout for swift proxy-server
# Defaults to undef. # Defaults to $::os_service_default.
# #
# [*recoverable_node_timeout*] # [*recoverable_node_timeout*]
# (optional) Configures recoverable_node_timeout for swift proxy-server # (optional) Configures recoverable_node_timeout for swift proxy-server
# Defaults to undef. # Defaults to $::os_service_default.
# #
# [*enabled*] # [*enabled*]
# (optional) Should the service be enabled. # (optional) Should the service be enabled.
@@ -180,10 +180,10 @@ class swift::proxy(
$max_containers_whitelist = $::os_service_default, $max_containers_whitelist = $::os_service_default,
$read_affinity = undef, $read_affinity = undef,
$write_affinity = undef, $write_affinity = undef,
$write_affinity_node_count = undef, $write_affinity_node_count = $::os_service_default,
$client_timeout = undef, $client_timeout = $::os_service_default,
$node_timeout = undef, $node_timeout = $::os_service_default,
$recoverable_node_timeout = undef, $recoverable_node_timeout = $::os_service_default,
$manage_service = true, $manage_service = true,
$enabled = true, $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
@@ -198,7 +198,7 @@ class swift::proxy(
validate_legacy(Boolean, 'validate_bool', $allow_account_management) validate_legacy(Boolean, 'validate_bool', $allow_account_management)
validate_legacy(Array, 'validate_array', $pipeline) validate_legacy(Array, 'validate_array', $pipeline)
if($write_affinity_node_count and ! $write_affinity) { if (!is_service_default($write_affinity_node_count) and !$write_affinity) {
fail('Usage of write_affinity_node_count requires write_affinity to be set') fail('Usage of write_affinity_node_count requires write_affinity to be set')
} }
@@ -260,8 +260,6 @@ class swift::proxy(
'app:proxy-server/account_autocreate': value => $account_autocreate; 'app:proxy-server/account_autocreate': value => $account_autocreate;
'app:proxy-server/max_containers_per_account': value => $max_containers_per_account; 'app:proxy-server/max_containers_per_account': value => $max_containers_per_account;
'app:proxy-server/max_containers_whitelist': value => $max_containers_whitelist; 'app:proxy-server/max_containers_whitelist': value => $max_containers_whitelist;
'app:proxy-server/write_affinity': value => $write_affinity;
'app:proxy-server/write_affinity_node_count': value => $write_affinity_node_count;
'app:proxy-server/node_timeout': value => $node_timeout; 'app:proxy-server/node_timeout': value => $node_timeout;
'app:proxy-server/recoverable_node_timeout': value => $recoverable_node_timeout; 'app:proxy-server/recoverable_node_timeout': value => $recoverable_node_timeout;
} }
@@ -278,6 +276,18 @@ class swift::proxy(
} }
} }
if $write_affinity {
swift_proxy_config {
'app:proxy-server/write_affinity': value => $write_affinity;
'app:proxy-server/write_affinity_node_count': value => $write_affinity_node_count;
}
} else {
swift_proxy_config {
'app:proxy-server/write_affinity': value => $::os_service_default;
'app:proxy-server/write_affinity_node_count': value => $::os_service_default;
}
}
if $read_affinity { if $read_affinity {
swift_proxy_config { swift_proxy_config {
'app:proxy-server/sorting_method': value => 'affinity'; 'app:proxy-server/sorting_method': value => 'affinity';

5
spec/classes/swift_proxy_spec.rb
View File

@@ -61,6 +61,7 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('DEFAULT/log_level').with_value('INFO') } it { should contain_swift_proxy_config('DEFAULT/log_level').with_value('INFO') }
it { should contain_swift_proxy_config('DEFAULT/log_headers').with_value('False') } it { should contain_swift_proxy_config('DEFAULT/log_headers').with_value('False') }
it { should contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log') } it { should contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('DEFAULT/client_timeout').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value( it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value(
['catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache', ['catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'listing_formats', 'tempauth', 'copy', 'proxy-logging', 'proxy-server'].join(' ')) } 'listing_formats', 'tempauth', 'copy', 'proxy-logging', 'proxy-server'].join(' ')) }
@@ -76,6 +77,10 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('app:proxy-server/account_autocreate').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('<SERVICE DEFAULT>') } 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_swift_proxy_config('app:proxy-server/max_containers_whitelist').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/write_affinity').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/write_affinity_node_count').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/node_timeout').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('app:proxy-server/recoverable_node_timeout').with_value('<SERVICE DEFAULT>') }
it { should contain_service('swift-proxy-server').with_require([ it { should contain_service('swift-proxy-server').with_require([
'Class[Swift::Proxy::Catch_errors]', 'Class[Swift::Proxy::Catch_errors]',